ref: 058566797a18e226acd1868a562b16e0903b73db
parent: 7d44c805cfc3aefb8b0850f2e3fca159439aea68
parent: dc9e1b7683a5e7cb0c21d12e27552ed4aa5eb152
author: John Koleszar <jkoleszar@google.com>
date: Fri Jul 22 20:05:14 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD