ref: 85c57d9ed2413307f27a522040e86c4edef035dd
parent: f54d561fa855997a08f0da598d4869f0347f295d
parent: 79d8ffd21306e25eb4f8353ca3af83b1e3e02750
author: John Koleszar <jkoleszar@google.com>
date: Tue Aug 16 20:05:12 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD