ref: dc1c3f9024e5f739b7d0b6a83d2967647f5d1c2a
parent: 0bc919b038d0996bec4c79a7e5c6d9450bc9bae6
parent: e68894fa03c03a93da8e5607be82c69e9782c585
author: John Koleszar <jkoleszar@google.com>
date: Fri Jul 15 20:05:05 EDT 2011
Merge remote branch 'internal/upstream' into HEAD