ref: b4159af4392ebddc7a66c5897271aeca77e569bf
parent: 4070c93bfa85ad77111e169e93ad207177bc7d8a
parent: d63ce5db34815029159b2ed87e3c6ce65c276662
author: John Koleszar <jkoleszar@google.com>
date: Sat May 28 20:05:10 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD