ref: 389228e408e6c08baf858d5b69132bea43cc62dc
parent: 9b5cd1c3ff746f769079d93c4ebd10dee28a91b9
parent: 25fa447acbd88c337e589954bb84ece50937e622
author: John Koleszar <jkoleszar@google.com>
date: Sat Nov 13 19:05:04 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD