Spirit: Merging from trunk

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