Merge branch 'master' into lilypond/translation

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

Sat, 1 May 2010 14:53:56 +0000 (16:53 +0200)

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

Sat, 1 May 2010 14:53:56 +0000 (16:53 +0200)
author Francisco Vila <francisco.vila@hispalinux.es>
Sat, 1 May 2010 14:53:56 +0000 (16:53 +0200)
committer Francisco Vila <francisco.vila@hispalinux.es>
Sat, 1 May 2010 14:53:56 +0000 (16:53 +0200)
diff --cc Documentation/es/usage/lilypond-book.itely
Simple merge
author	Francisco Vila <francisco.vila@hispalinux.es>
	Sat, 1 May 2010 14:53:56 +0000 (16:53 +0200)
committer	Francisco Vila <francisco.vila@hispalinux.es>
	Sat, 1 May 2010 14:53:56 +0000 (16:53 +0200)