Merge branch 'lilypond/translation'

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

Sun, 30 Oct 2011 16:24:51 +0000 (17:24 +0100)

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

Sun, 30 Oct 2011 16:24:51 +0000 (17:24 +0100)
author Francisco Vila <francisco.vila@hispalinux.es>
Sun, 30 Oct 2011 16:24:51 +0000 (17:24 +0100)
committer Francisco Vila <francisco.vila@hispalinux.es>
Sun, 30 Oct 2011 16:24:51 +0000 (17:24 +0100)
diff --cc Documentation/ja/notation/changing-defaults.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Sun, 30 Oct 2011 16:24:51 +0000 (17:24 +0100)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Sun, 30 Oct 2011 16:24:51 +0000 (17:24 +0100)