Merging from trunk

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