Merge branch 'master' into lilypond/translation

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

Mon, 23 Mar 2009 08:56:41 +0000 (09:56 +0100)

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

Mon, 23 Mar 2009 08:56:41 +0000 (09:56 +0100)
author Francisco Vila <francisco.vila@hispalinux.es>
Mon, 23 Mar 2009 08:56:41 +0000 (09:56 +0100)
committer Francisco Vila <francisco.vila@hispalinux.es>
Mon, 23 Mar 2009 08:56:41 +0000 (09:56 +0100)
diff --cc Documentation/es/user/fretted-strings.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Mon, 23 Mar 2009 08:56:41 +0000 (09:56 +0100)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Mon, 23 Mar 2009 08:56:41 +0000 (09:56 +0100)