Merging from trunk

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