ref: 42cb1d84f275211be7cc48685326b82827a9e88c
parent: 5d012fc26bdf01f366cc1e3564f3d6b77678eb12
parent: a32ded1d5f32997ff4ba20fbdb71306798b05d3e
author: John Koleszar <jkoleszar@google.com>
date: Thu Sep 9 20:05:04 EDT 2010
Merge remote branch 'internal/upstream' into HEAD