merged from trunk

svn path=/branches/proto/v4/boost/token_functions.hpp; revision=49439
merged from trunk

svn path=/branches/proto/v4/libs/tokenizer/; revision=49607