Merging from trunk

svn path=/branches/release/libs/tokenizer/; revision=84745