ref: 91a96ccc87d1cc82de35a23aaac4e6700e7f9a25
parent: fbc78c242814e499610da4d3d03369aae77b22bb
parent: b7a6f1d20e958ce4dbce4555637a5948390797b1
author: John Koleszar <jkoleszar@google.com>
date: Mon Aug 22 20:05:05 EDT 2011
Merge remote branch 'internal/upstream' into HEAD