Merge "fixed a compiling problem with MSVC win32 build"
authorPaul Wilkins <paulwilkins@google.com>
Wed, 26 Jun 2013 18:58:16 +0000 (11:58 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 26 Jun 2013 18:58:16 +0000 (11:58 -0700)

Trivial merge