ref: df3296c8a107d68a35915fc224d5d151cc4af87d
parent: 42f9104d5c4e3b7f91f3e49a5e085cf0096e08c0
parent: 53d11fa6ad8dc65cf335a108b0830dac07175c11
author: John Koleszar <jkoleszar@google.com>
date: Thu Mar 17 20:05:06 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD