Merge "a tiny fix for MSVC build" into experimental
authorDebargha Mukherjee <debargha@google.com>
Wed, 8 Aug 2012 23:12:23 +0000 (16:12 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 8 Aug 2012 23:12:23 +0000 (16:12 -0700)

Trivial merge