Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Wed, 5 Jan 2011 05:05:07 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 5 Jan 2011 05:05:08 +0000 (00:05 -0500)
Change-Id: Ib7a1fdc49f9db6ebbd6a43ca139f842d9a260c5d


Trivial merge