ref: 3a0f8e078374a26d2008455abf9d4ac7865626d4
parent: 39e36f8604ca5acac27104055b6902645a947978
parent: e965d8f6f3d7079bbccac975e057d2b2daa0e20c
author: John Koleszar <jkoleszar@google.com>
date: Fri May 6 20:05:11 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD