Merged r6139 from trunk.
Swedish translation updated by Nicklas Holm.
Authored by: tmaruyama 2011-07-01
Parent: [r6139]
Child: [r6141]