Spirit: Merging trunk

svn path=/branches/release/boost/spirit/; revision=83487