ref: 3454bf291021182418d6483f7cad003587e356dc
parent: 760d3475eb0566c57775c5101f483783658ddf98
parent: 2a68727af9d0705fbafef7a69e6101cc6a8a2ce5
author: John Koleszar <jkoleszar@google.com>
date: Mon Dec 27 19:05:08 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD