ref: ea24bc87603d139014bf697aa2fb26b76d3c1c1d
parent: 01aa85ef725698bdcbcf37ebc5cf1653f106ffb0
parent: eee331e7f3185b57a3c64d97b999422925064f49
author: John Koleszar <jkoleszar@google.com>
date: Sat Dec 18 19:05:25 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD