v2, v3, integration branch

svn path=/branches/filesystem3/boost/non_type.hpp; revision=62649