merge [62749].

svn path=/branches/release/boost/token_functions.hpp; revision=82907