ref: ce7339544752204393ac7d70da2f3af606e9224f
parent: c9baf67f6c16f37aac05dd3a0d11b23c2fdaf450
parent: 394b68c8f8f3d86fd0b30249aa2730317dc2be82
author: John Koleszar <jkoleszar@google.com>
date: Wed Nov 24 19:05:05 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD