ref: f420000184b49c22d828a4ad56dc01e433ee63e3
parent: 3bf929f18ed259e12af525c326cd10c2e6e2d9ac
parent: 0f02b37992c3475f9a8c9a555ab63d39c67512aa
author: John Koleszar <jkoleszar@google.com>
date: Fri Dec 10 19:05:08 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD