Merge "Normalize more intrinsic filenames"
authorJohann <johann.koenig@duck.com>
Fri, 26 Apr 2013 06:30:41 +0000 (23:30 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 26 Apr 2013 06:30:41 +0000 (23:30 -0700)

Trivial merge