Merging from trunk

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