Merge "Fixing compilation error on Mac OS."
authorDmitry Kovalev <dkovalev@google.com>
Mon, 17 Jun 2013 21:40:29 +0000 (14:40 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 17 Jun 2013 21:40:29 +0000 (14:40 -0700)

Trivial merge