ref: 416484774830a5d2e6e63d413796b5330480cee2
parent: 74441baac5a413000c21b70a063f58d1707487fd
parent: e5f7139951a0bf3cccb12ed12419dc85773a67a8
author: John Koleszar <jkoleszar@google.com>
date: Wed Dec 29 19:05:14 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD