Merging from trunk

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