Merge branch 'master' into lilypond/translation

author Francisco Vila <francisco.vila@hispalinux.es>

Sun, 6 Feb 2011 02:12:35 +0000 (03:12 +0100)

committer Francisco Vila <francisco.vila@hispalinux.es>

Sun, 6 Feb 2011 02:12:35 +0000 (03:12 +0100)
author Francisco Vila <francisco.vila@hispalinux.es>
Sun, 6 Feb 2011 02:12:35 +0000 (03:12 +0100)
committer Francisco Vila <francisco.vila@hispalinux.es>
Sun, 6 Feb 2011 02:12:35 +0000 (03:12 +0100)
diff --cc Documentation/de/notation/changing-defaults.itely
Simple merge
diff --cc Documentation/hu/learning/common-notation.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Sun, 6 Feb 2011 02:12:35 +0000 (03:12 +0100)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Sun, 6 Feb 2011 02:12:35 +0000 (03:12 +0100)
		1	2
Documentation/de/notation/changing-defaults.itely	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/hu/learning/common-notation.itely	patch \|	diff1 \|	diff2 \|	blob \| history