ref: 85278f8c1d74d36d568c0b02aa7d083a49c98610
parent: dc1c3f9024e5f739b7d0b6a83d2967647f5d1c2a
parent: 8bf2cbce9850c68bf58bc210ba8fff96a21d76ba
author: John Koleszar <jkoleszar@google.com>
date: Sat Jul 16 20:05:04 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD