ref: 9857ebce96e9c4d92b961f676f68ae681ab8efa2
parent: cac05c832e60ac5f07c8ffc1daada52d976a4489
parent: 3a99784b5e4695bd99a50f412fec22169fe7b1fa
author: John Koleszar <jkoleszar@google.com>
date: Wed Nov 10 19:05:03 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD