Merge from trunk.

svn path=/branches/hash/libs/intrusive/; revision=40260