ref: f3af9c8fb7cd758c865e5a7ce0f9e9b01a7af835
parent: d9c50b8103cccff25f4be944958bd1d65e4a3504
parent: 808f3814fc1e8c93ba7358f54a02a81c2d440189
author: John Koleszar <jkoleszar@google.com>
date: Thu Dec 9 19:05:09 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD