ref: 908a9386f462f3c791b16b739055819cfbc1776b
parent: cfc44aae032229738be07835faad975310418329
parent: ea2a5754b4bc25dbb4ce5eb03bd632dfd756540c
author: John Koleszar <jkoleszar@google.com>
date: Thu Dec 2 19:05:06 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD