Merging from trunk

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