Merging from trunk

svn path=/branches/release/libs/static_assert/; revision=84745