ref: edfb6dc7c3ab2bfcb83dd32cc76d05078dc34ecd
parent: 1d44e7ce1ff748bd07a66bd146d956b2c38caf1c
parent: 1158bcd8135b38b61fb60291ac4ac9a91ac20f25
author: John Koleszar <jkoleszar@google.com>
date: Fri Sep 16 20:05:04 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD