Merge branch 'master' of git://git.sv.gnu.org/lilypond

author Mats Bengtsson <mats.bengtsson@s3.kth.se>

Mon, 14 May 2007 08:08:38 +0000 (10:08 +0200)

committer Mats Bengtsson <mats.bengtsson@s3.kth.se>

Mon, 14 May 2007 08:08:38 +0000 (10:08 +0200)
author Mats Bengtsson <mats.bengtsson@s3.kth.se>
Mon, 14 May 2007 08:08:38 +0000 (10:08 +0200)
committer Mats Bengtsson <mats.bengtsson@s3.kth.se>
Mon, 14 May 2007 08:08:38 +0000 (10:08 +0200)
diff --cc Documentation/user/advanced-notation.itely
Simple merge
author	Mats Bengtsson <mats.bengtsson@s3.kth.se>
	Mon, 14 May 2007 08:08:38 +0000 (10:08 +0200)
committer	Mats Bengtsson <mats.bengtsson@s3.kth.se>
	Mon, 14 May 2007 08:08:38 +0000 (10:08 +0200)