merged from trunk

svn path=/branches/proto/v4/boost/spirit.hpp; revision=47983
merged from trunk

svn path=/branches/proto/v4/boost/spirit/; revision=48169
merged from trunk

svn path=/branches/proto/v4/boost/spirit/; revision=48605
merged from trunk

svn path=/branches/proto/v4/boost/spirit/; revision=48673
merged from trunk

svn path=/branches/proto/v4/boost/spirit/; revision=49133
merged from trunk

svn path=/branches/proto/v4/boost/spirit/; revision=49439
merged from trunk

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