Merged r6094 from trunk.
German translation updated by Jens Martsch.
Authored by: tmaruyama 2011-06-17
Parent: [r6094]
Child: [r6096]