ref: d83585eb682201098ac0766a8e290023369436b6
parent: 46214a2c64bc0adf60b303dd7348b2e2adf81348
parent: 16724b7c9387e227e1c5020d2bcf833d303806f0
author: John Koleszar <jkoleszar@google.com>
date: Sat Dec 4 19:05:10 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD