ref: c24479e8709e68034ae6aac58ba355122fde49fc
parent: ef7f489dc339c7f1d29cd1c442b57f2a1fd92840
parent: e83d36c053199693eadac5774b47d17416cb8954
author: John Koleszar <jkoleszar@google.com>
date: Fri Jul 8 20:05:04 EDT 2011
Merge remote branch 'internal/upstream' into HEAD