ref: 03ee491d515240d4c1b8d9c8b120c8e61c8da90a
parent: c24479e8709e68034ae6aac58ba355122fde49fc
parent: 6058c9ce0cd8305b13a4766370c67059f789b816
author: John Koleszar <jkoleszar@google.com>
date: Sat Jul 9 20:05:08 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD