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

Conflicts:

	buildscripts/git-update-changelog.py
	scm/define-grob-properties.scm
	scm/music-functions.scm

diff --cc buildscripts/git-update-changelog.py
index e3bc06384fcc7bacadfd4c63686b9fdfea063702,35dd2e6c7538795821ed1a6abc41706578e9bead..54ab112d0bcaf43fe4a24ec9090ec45b39ba884e
--- 1/buildscripts/git-update-changelog.py
--- 2/buildscripts/git-update-changelog.py
+++ b/buildscripts/git-update-changelog.py
@@@ -44,6 -44,6 +44,7 @@@ class Commit
      def compare (self, other):
          return sign (time.mktime (self.date) - time.mktime (other.date))
  
++
      def check_diff_chunk (self, filename, chunk):
          removals = []
          def note_removal (m):
@@@ -53,10 -53,7 +54,10 @@@
  
          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:

diff --cc scm/music-functions.scm
Simple merge