Merge branch 'master' into dev/texi2html

author Reinhold Kainhofer <reinhold@kainhofer.com>

Mon, 7 Jul 2008 14:10:33 +0000 (16:10 +0200)

committer Reinhold Kainhofer <reinhold@kainhofer.com>

Mon, 7 Jul 2008 14:10:33 +0000 (16:10 +0200)
author Reinhold Kainhofer <reinhold@kainhofer.com>
Mon, 7 Jul 2008 14:10:33 +0000 (16:10 +0200)
committer Reinhold Kainhofer <reinhold@kainhofer.com>
Mon, 7 Jul 2008 14:10:33 +0000 (16:10 +0200)
diff --cc GNUmakefile.in
Simple merge
diff --cc configure.in
Simple merge
diff --cc input/lsr/lilypond-snippets.tely
Simple merge
author	Reinhold Kainhofer <reinhold@kainhofer.com>
	Mon, 7 Jul 2008 14:10:33 +0000 (16:10 +0200)
committer	Reinhold Kainhofer <reinhold@kainhofer.com>
	Mon, 7 Jul 2008 14:10:33 +0000 (16:10 +0200)
		1	2
GNUmakefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
input/lsr/lilypond-snippets.tely	patch \|	diff1 \|	diff2 \|	blob \| history