Spirit: Merging from trunk

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