ref: 9443cd9c54bb1731dd95b44eeb6f7761a05dfd75
parent: 3743fd0cc7a95de44fde4ca91ee93a31a6c700dc
parent: 7cb5a750311048245130ce093309d0402bb438c2
author: John Koleszar <jkoleszar@google.com>
date: Thu Aug 18 20:05:11 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD