Merging from trunk

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