Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

Conflicts:

	buildscripts/git-update-changelog.py

diff --cc ChangeLog
Simple merge

diff --cc buildscripts/git-update-changelog.py
index 82c5d6316d04ed4d80651f2b1f0ac32e3730ea66,465e407ce1db46d73091003d762fa334fc7d965f..09f0d16b7afebad8214b9463cef4076fdc5f1301
--- 1/buildscripts/git-update-changelog.py
--- 2/buildscripts/git-update-changelog.py
+++ b/buildscripts/git-update-changelog.py
@@@ -54,10 -53,10 +54,9 @@@ class Commit
  
          if removals == []:
              return True
--
          if not os.path.exists (filename):
              return False
-    
 -        
++
          contents = open (filename).read ()
          for r in removals:
              if r not in contents: