Merged r11529 from trunk to 2.2-stable (#13343, #13339)
r11529 has some 2.2-stable translation.
Authored by: tmaruyama 2013-03-03
Parent: [r11531]
Child: [r11533]