Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Sat, 16 Jul 2011 04:05:08 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Sat, 16 Jul 2011 04:05:08 +0000 (00:05 -0400)
Change-Id: Ic623c335cd4991c9d80f675f390e81282b18c137


Trivial merge