ref: 0661ab00f387fbf12ad31557b8d659a31c927fee
parent: 388546bc93f966236bcac920322e66a9050414da
parent: 791cae74da9acdadc11ea701104852b5fa7f0a5f
author: John Koleszar <jkoleszar@google.com>
date: Tue Nov 16 19:05:04 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD