ref: b21fe3b27818826b2e5d687da22a90ad40c459f3
parent: 0c5a048fa6f9590316fb668a372622402eaa0f43
parent: 945dad277d3c09708956d60bf7844d47e0eeed1f
author: John Koleszar <jkoleszar@google.com>
date: Fri Feb 18 19:05:44 EST 2011
Merge remote branch 'internal/upstream' into HEAD