Merge commit 'origin' into beamlets2

author Joe Neeman <joeneeman@gmail.com>

Wed, 31 Dec 2008 04:07:52 +0000 (15:07 +1100)

committer Joe Neeman <joeneeman@gmail.com>

Wed, 31 Dec 2008 04:07:52 +0000 (15:07 +1100)
author Joe Neeman <joeneeman@gmail.com>
Wed, 31 Dec 2008 04:07:52 +0000 (15:07 +1100)
committer Joe Neeman <joeneeman@gmail.com>
Wed, 31 Dec 2008 04:07:52 +0000 (15:07 +1100)
diff --cc lily/beam.cc
Simple merge
diff --cc lily/stem.cc
Simple merge
diff --cc scm/define-grob-properties.scm
Simple merge
diff --cc scm/define-grobs.scm
Simple merge
author	Joe Neeman <joeneeman@gmail.com>
	Wed, 31 Dec 2008 04:07:52 +0000 (15:07 +1100)
committer	Joe Neeman <joeneeman@gmail.com>
	Wed, 31 Dec 2008 04:07:52 +0000 (15:07 +1100)
		1	2
lily/beam.cc	patch \|	diff1 \|	diff2 \|	blob \| history
lily/stem.cc	patch \|	diff1 \|	diff2 \|	blob \| history
scm/define-grob-properties.scm	patch \|	diff1 \|	diff2 \|	blob \| history
scm/define-grobs.scm	patch \|	diff1 \|	diff2 \|	blob \| history