Merge "Fix mingw build error" into experimental
authorJohn Koleszar <jkoleszar@google.com>
Fri, 7 Jun 2013 19:10:22 +0000 (12:10 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 7 Jun 2013 19:10:22 +0000 (12:10 -0700)

Trivial merge