ref: 0bc919b038d0996bec4c79a7e5c6d9450bc9bae6
parent: 087b338d9ef0440b128fc7a034cc0faa8aa7f226
parent: f1fcd74e3ea77ff7cbe9a8ab37ceec3888ba8ac3
author: John Koleszar <jkoleszar@google.com>
date: Fri Jul 15 20:05:04 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD