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

Conflicts:

	.gitignore
	scm/lily.scm

diff --cc ChangeLog
Simple merge

diff --cc scm/lily.scm
index 72e2956467c4a7d292cdbaa3deedd21e97d2102e,2c47415ff0adb278e33d6daf32c4495ef7eef33e..e7d6e8d0ce2226554a9bc05a5b201c32cd8c5cdf
--- 1/scm/lily.scm
--- 2/scm/lily.scm
+++ b/scm/lily.scm
@@@ -20,14 -20,14 +20,12 @@@
              (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG")
              (check-internal-types #f "check every property assignment for types")
              (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-parser #f "debug the bison parser")
++            (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-lexer #f "debug the flex lexer")
              (debug-midi #f "generate human readable MIDI")
-             (debug-lexer #f "debug the flex lexer")
 +            (debug-parser #f "debug the bison parser")
              (delete-intermediate-files #f
                                         "delete unusable PostScript files")
              (dump-signatures #f "dump output signatures of each system")