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

Conflicts:

	Documentation/user/introduction.itely
	Documentation/user/scheme-tutorial.itely

diff --cc Documentation/user/advanced-notation.itely
Simple merge

diff --cc Documentation/user/basic-notation.itely
Simple merge

diff --cc Documentation/user/changing-defaults.itely
Simple merge

diff --cc Documentation/user/converters.itely
Simple merge

diff --cc Documentation/user/instrument-notation.itely
Simple merge

diff --cc Documentation/user/introduction.itely
Simple merge

diff --cc Documentation/user/lilypond-book.itely
Simple merge

diff --cc Documentation/user/non-music.itely
Simple merge

diff --cc Documentation/user/notation-appendices.itely
Simple merge

diff --cc Documentation/user/programming-interface.itely
Simple merge

diff --cc Documentation/user/putting.itely
Simple merge

diff --cc Documentation/user/running.itely
Simple merge

diff --cc Documentation/user/scheme-tutorial.itely
Simple merge

diff --cc Documentation/user/spacing.itely
Simple merge

diff --cc Documentation/user/tutorial.itely
Simple merge

diff --cc Documentation/user/tweaks.itely
Simple merge

diff --cc Documentation/user/working.itely
Simple merge