Merge branch 'master' into jneeman

author Joe Neeman <joeneeman@gmail.com>

Mon, 9 Jul 2007 04:37:24 +0000 (14:37 +1000)

committer Joe Neeman <joeneeman@gmail.com>

Mon, 9 Jul 2007 04:37:24 +0000 (14:37 +1000)
author Joe Neeman <joeneeman@gmail.com>
Mon, 9 Jul 2007 04:37:24 +0000 (14:37 +1000)
committer Joe Neeman <joeneeman@gmail.com>
Mon, 9 Jul 2007 04:37:24 +0000 (14:37 +1000)
diff --cc Documentation/user/instrument-notation.itely
Simple merge
author	Joe Neeman <joeneeman@gmail.com>
	Mon, 9 Jul 2007 04:37:24 +0000 (14:37 +1000)
committer	Joe Neeman <joeneeman@gmail.com>
	Mon, 9 Jul 2007 04:37:24 +0000 (14:37 +1000)