Merge "Trivial clean up."
authorGuillaume Martres <gmartres@google.com>
Tue, 13 Aug 2013 19:40:37 +0000 (12:40 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 13 Aug 2013 19:40:37 +0000 (12:40 -0700)

Trivial merge