Save state before 1.36 merges.

svn path=/branches/pdimov_pre_136/boost/non_type.hpp; revision=47337