Merge "cosmetics: trim trailing whitespace"
authorJohn Koleszar <jkoleszar@google.com>
Fri, 18 Jun 2010 17:26:16 +0000 (10:26 -0700)
committerCode Review <code-review@webmproject.org>
Fri, 18 Jun 2010 17:26:16 +0000 (10:26 -0700)

Trivial merge