merged from trunk

svn path=/branches/proto/v4/boost/spirit/; revision=49607