Merging from trunk

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