ref: d26fafd4e5069417e12a01f8b44d36ce86c6f77b
parent: 67864c5f97618dbe561650b3094cb2bd3428b83d
parent: d2a2d5a6d5ea1886eef6078d180be364d80501bc
author: John Koleszar <jkoleszar@google.com>
date: Wed Aug 24 20:05:05 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD