Merging from trunk

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