Spirit: Merging from trunk

svn path=/branches/release/boost/property_map/; revision=84640