Merge branch 'master' into lilypond/translation

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

Mon, 13 Sep 2010 16:06:55 +0000 (18:06 +0200)

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

Mon, 13 Sep 2010 16:06:55 +0000 (18:06 +0200)
author Francisco Vila <francisco.vila@hispalinux.es>
Mon, 13 Sep 2010 16:06:55 +0000 (18:06 +0200)
committer Francisco Vila <francisco.vila@hispalinux.es>
Mon, 13 Sep 2010 16:06:55 +0000 (18:06 +0200)
diff --cc Documentation/de/notation/notation-appendices.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Mon, 13 Sep 2010 16:06:55 +0000 (18:06 +0200)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Mon, 13 Sep 2010 16:06:55 +0000 (18:06 +0200)