ref: 6901105e99848561b5804f3aa040c5a3eb089d14
parent: 338d0728f69248ab6479a9f6bafdb24ed064b625
parent: 4ab3175b123b6804029efc14f98d87c491e130d1
author: John Koleszar <jkoleszar@google.com>
date: Wed Jul 13 20:05:04 EDT 2011
Merge remote branch 'internal/upstream' into HEAD