ref: adbb1de01c69d815532e97efa0a7c2ad7c373b8f
parent: 08d45a99b5785fbc5e0cfe98d80a5876c709c312
parent: 7d799d2ced458e5988fe43bbb7f53a46ed8b877f
author: John Koleszar <jkoleszar@google.com>
date: Fri Nov 12 19:05:05 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD