ref: d0079ef946ed58ac195939ba5b9deb15b55fdcb2
parent: 6901105e99848561b5804f3aa040c5a3eb089d14
parent: 86edcb0cc78fac2c3c086702fa98934e690bc290
author: John Koleszar <jkoleszar@google.com>
date: Thu Jul 14 20:05:04 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD