ref: 791ad1bb376f9871bb8c15589bbddb743c6fe917
parent: 03ee491d515240d4c1b8d9c8b120c8e61c8da90a
parent: 587ca06da9d652d60309679c14a1c0b310c93c66
author: John Koleszar <jkoleszar@google.com>
date: Tue Jul 12 20:05:03 EDT 2011
Merge remote branch 'internal/upstream' into HEAD