merged from trunk

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

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