Terminate this branch.

svn path=/branches/fix-links/boost/non_type.hpp; revision=43802