ref: 8f01c2d78481b9fb081dd85894d95d2756a34886
parent: 1c24eb2b7b3a61893ea19e9e544c24a233f89921
parent: 6907117175b2b1d913fc37877647c4e70d803a85
author: John Koleszar <jkoleszar@google.com>
date: Wed Jul 20 20:05:05 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD