Merge "Be explicit about 'in-place'"
authorJohann <johannkoenig@google.com>
Mon, 21 May 2012 22:01:20 +0000 (15:01 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 21 May 2012 22:01:20 +0000 (15:01 -0700)

Trivial merge