Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen

diff --cc scm/lily.scm
index 7bd67c0fc64f92f307b2d659d5e1ecc1aec6a017,edd99461d5d7a7e7aca37959e6b633f3f11c1824..ee17b9fbc77c9f20f027b408c0b90d22cfab7c70
--- 1/scm/lily.scm
--- 2/scm/lily.scm
+++ b/scm/lily.scm
@@@ -22,9 -22,6 +22,12 @@@
              (clip-systems #f "Generate cut-out snippets of a score")
              (debug-gc #f
                        "dump memory debugging statistics")
 +            (debug-gc-assert-parsed-dead #f
 +                      "for memory debugging: ensure that all refs to parsed objects are dead.")
 +            
++            (debug-midi #f "generate human readable MIDI")
++            (debug-parser #f "debug the bison parser")
++            (debug-lexer #f "debug the flex lexer")
              (debug-midi #f "generate human readable MIDI")
              (debug-parser #f "debug the bison parser")
              (debug-lexer #f "debug the flex lexer")