Merging from trunk

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