Merge "Merge various count_token() functions into a single one." into experimental
authorRonald S. Bultje <rbultje@google.com>
Sat, 17 Nov 2012 22:40:41 +0000 (14:40 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Sat, 17 Nov 2012 22:40:41 +0000 (14:40 -0800)

Trivial merge