Merged r5986 from trunk.
German translation updated by Jens Martsch.
Authored by: tmaruyama 2011-06-01
Parent: [r5986]
Child: [r5988]