Spirit: Merging from trunk

svn path=/branches/release/boost/unordered_map.hpp; revision=84640