Merging from trunk

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