Merge branch 'master' of ssh+git://gpercival@git.sv.gnu.org/srv/git/lilypond

author Graham Percival <graham@percival-music.ca>

Wed, 31 Jan 2007 20:25:22 +0000 (12:25 -0800)

committer Graham Percival <graham@percival-music.ca>

Wed, 31 Jan 2007 20:25:22 +0000 (12:25 -0800)
author Graham Percival <graham@percival-music.ca>
Wed, 31 Jan 2007 20:25:22 +0000 (12:25 -0800)
committer Graham Percival <graham@percival-music.ca>
Wed, 31 Jan 2007 20:25:22 +0000 (12:25 -0800)
diff --cc Documentation/user/instrument-notation.itely
Simple merge
author	Graham Percival <graham@percival-music.ca>
	Wed, 31 Jan 2007 20:25:22 +0000 (12:25 -0800)
committer	Graham Percival <graham@percival-music.ca>
	Wed, 31 Jan 2007 20:25:22 +0000 (12:25 -0800)