Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Fri, 12 Nov 2010 05:05:03 +0000 (00:05 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 12 Nov 2010 05:05:03 +0000 (00:05 -0500)

Trivial merge