Merge ""Eliminated TOKENEXTRABITS" broke the windows build."
authorJohann <johannkoenig@google.com>
Tue, 26 Jul 2011 13:34:31 +0000 (06:34 -0700)
committerCode Review <code-review@webmproject.org>
Tue, 26 Jul 2011 13:34:31 +0000 (06:34 -0700)

Trivial merge