Merged locales updates (r4592 to 4595) from trunk.
Authored by: jplang 2010-12-30
Parent: [r4595]
Child: [r4597]