ref: 18ef62d40c3267729adc9b8005f598e15bbf8a74
parent: b6aee6ffab4f0b3e9eac2f14329998d6ac2a19d4
parent: cbe07a749120a48e827c881cbdf9a649a32e25b8
author: John Koleszar <jkoleszar@google.com>
date: Fri Jan 21 19:05:13 EST 2011
Merge remote branch 'internal/upstream-experimental' into HEAD