Merge r6699 from trunk
remove trailing white-spaces from config/locales/zh.yml
Authored by: tmaruyama 2011-11-13
Parent: [r7792]
Child: [r7794]