merged from trunk

svn path=/branches/proto/v4/libs/proto/; revision=48080
merged from trunk

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

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

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

svn path=/branches/proto/v4/libs/proto/; revision=48896
merged from trunk

svn path=/branches/proto/v4/libs/proto/; revision=48916
merged from trunk

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

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

svn path=/branches/proto/v4/libs/proto/; revision=49607