ref: be9a727bd6c42ddc6444e52caa68caccecd1b6ad
parent: f99e91b65b9aaf2a20d9652b2c4f05cef7931259
parent: 1b70862916bc33e372f95c725bd24947b0afb308
author: John Koleszar <jkoleszar@google.com>
date: Tue Nov 30 19:05:07 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD