Merge patches from Trunk.

svn path=/branches/release/boost/static_assert.hpp; revision=83496