ref: 65b1648f35b3212bd8beb024d7c4095f138274d0
parent: 6edd07d6561522f81b2a09a2a160d74808b14363
parent: ba6f60dba70ad56fbfd1080bb4555f078bc774bf
author: John Koleszar <jkoleszar@google.com>
date: Tue May 10 20:05:07 EDT 2011
Merge remote branch 'internal/upstream' into HEAD