ref: ef7f489dc339c7f1d29cd1c442b57f2a1fd92840
parent: 573a3f35eaed30a986a9d97905f05881f602bf9c
parent: 2c3c54f7475021e2fbc62998b042e54efa9f142c
author: John Koleszar <jkoleszar@google.com>
date: Fri Jul 8 04:57:03 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD