ref: 6deaad296af43e462b92271cbf4f9bfec774f8c4
parent: 1f1526f8b8c4f0aef0f65d6fcea21f946f8a2742
parent: 3f4291e6e0a15ae043165c4f1e787d916bb4527d
author: John Koleszar <jkoleszar@google.com>
date: Thu Mar 24 20:05:04 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD