Merging from trunk

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