Merge in changes.

svn path=/sandbox-branches/unordered-refactor/boost/unordered/; revision=42180