ref: 338d0728f69248ab6479a9f6bafdb24ed064b625
parent: 791ad1bb376f9871bb8c15589bbddb743c6fe917
parent: ffc4587a47bf9a12e867310da8060662d08c0da2
author: John Koleszar <jkoleszar@google.com>
date: Wed Jul 13 20:05:04 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD