ref: 9625fd83dd4141331d627f391268d9d90b47e38c
parent: 006247ac332159c107ed2db7065b0b7c7839fa46
parent: b13d1c307e721e6475cfda83182b7e4aa5b49c3c
author: John Koleszar <jkoleszar@google.com>
date: Mon Nov 22 19:05:05 EST 2010
Merge remote branch 'internal/upstream-experimental' into HEAD