merged from trunk

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

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

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

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

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

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

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

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

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

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