Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

author Joe Neeman <joeneeman@gmail.com>

Sun, 26 Nov 2006 17:11:30 +0000 (19:11 +0200)

committer Joe Neeman <joeneeman@gmail.com>

Sun, 26 Nov 2006 17:11:30 +0000 (19:11 +0200)
author Joe Neeman <joeneeman@gmail.com>
Sun, 26 Nov 2006 17:11:30 +0000 (19:11 +0200)
committer Joe Neeman <joeneeman@gmail.com>
Sun, 26 Nov 2006 17:11:30 +0000 (19:11 +0200)
diff --cc scm/define-grobs.scm
Simple merge
diff --cc scm/lily.scm
Simple merge
author	Joe Neeman <joeneeman@gmail.com>
	Sun, 26 Nov 2006 17:11:30 +0000 (19:11 +0200)
committer	Joe Neeman <joeneeman@gmail.com>
	Sun, 26 Nov 2006 17:11:30 +0000 (19:11 +0200)
		1	2
scm/define-grobs.scm	patch \|	diff1 \|	diff2 \|	blob \| history
scm/lily.scm	patch \|	diff1 \|	diff2 \|	blob \| history