Merge "Fix compiler warnings" into eider
authorJohn Koleszar <jkoleszar@google.com>
Wed, 2 May 2012 23:22:34 +0000 (16:22 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 2 May 2012 23:22:34 +0000 (16:22 -0700)

Trivial merge