ref: 96513c42b2e34ea096edd9eb649120362c71836f
parent: 664cd5ac91d432bad9f4f375b583a490464288c5
parent: e14ad46efa3bab23a18634e72e15714937f08ae9
author: John Koleszar <jkoleszar@google.com>
date: Sat Jul 23 20:05:15 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD