Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Wed, 21 Sep 2011 04:05:04 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 21 Sep 2011 04:05:04 +0000 (00:05 -0400)

Trivial merge