Merging from trunk

svn path=/branches/release/libs/locale/; revision=84745