Merged r6028 from trunk.
Spanish translation updated by Jorge López.
Authored by: tmaruyama 2011-06-09
Parent: [r6028]
Child: [r6030]