ref: 8d1b8f232298096fea0956cd66a400bcbecb4132
parent: b170d20111900a5d3566ef5b1b5e7f6b70b7717f
parent: 7e9910c69b7c8b008551a3349add4675050aba88
author: John Koleszar <jkoleszar@google.com>
date: Sun Dec 5 19:05:08 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD