Merge r6698 from trunk
Ruby 1.9: fix parsing error of zh.yml with psych yaml library
Authored by: tmaruyama 2011-11-13
Parent: [r7791]
Child: [r7793]