ref: 9484bf7f57f9908d87f0447b093443056a77d009
parent: 9d8a1c078144bd8e16a43159a760c4d524cb7324
parent: 94c52e4da8a3532989c84f6b0da695dfaeb18449
author: John Koleszar <jkoleszar@google.com>
date: Fri Jun 18 06:26:16 EDT 2010
Merge "cosmetics: trim trailing whitespace"