Merge branch 'master' into lilypond/translation

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

Tue, 3 May 2011 11:23:06 +0000 (13:23 +0200)

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

Tue, 3 May 2011 11:23:06 +0000 (13:23 +0200)
author Francisco Vila <francisco.vila@hispalinux.es>
Tue, 3 May 2011 11:23:06 +0000 (13:23 +0200)
committer Francisco Vila <francisco.vila@hispalinux.es>
Tue, 3 May 2011 11:23:06 +0000 (13:23 +0200)
diff --cc Documentation/es/notation/fretted-strings.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Tue, 3 May 2011 11:23:06 +0000 (13:23 +0200)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Tue, 3 May 2011 11:23:06 +0000 (13:23 +0200)