ref: 668950df7951d89c071f7d1184a3323f97f58781
parent: 4bca01d25c95465b3d3c40b9aa6386358c1273ed
parent: 1d7c6e79d9df0512291a824de2af4ac1b3855bed
author: John Koleszar <jkoleszar@google.com>
date: Fri Dec 17 19:05:25 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD