Spirit: Merging from trunk

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