ref: 06e9386422c1b64b3fc2973b7c0ffd6546285b80
parent: f6146612425ffc7523930e79ba43a253a7540693
parent: ca60e0c2f9f7b70a576c28f20d84d77acc95f958
author: John Koleszar <jkoleszar@google.com>
date: Thu Jul 21 20:05:06 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD