Merge branch 'master' into lilypond/translation

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

Thu, 22 Jan 2009 14:24:40 +0000 (15:24 +0100)

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

Thu, 22 Jan 2009 14:24:40 +0000 (15:24 +0100)
author Francisco Vila <francisco.vila@hispalinux.es>
Thu, 22 Jan 2009 14:24:40 +0000 (15:24 +0100)
committer Francisco Vila <francisco.vila@hispalinux.es>
Thu, 22 Jan 2009 14:24:40 +0000 (15:24 +0100)
diff --cc Documentation/es/user/changing-defaults.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Thu, 22 Jan 2009 14:24:40 +0000 (15:24 +0100)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Thu, 22 Jan 2009 14:24:40 +0000 (15:24 +0100)