ref: 9b8f82779d7029df39017307c65a0d0f2c958fdf
parent: 766fce16c42ac11c9cf08731ac5d73376d420743
parent: 54c36378287805f4a7aefb89982f7d80b223b3dd
author: John Koleszar <jkoleszar@google.com>
date: Fri Jul 1 20:05:10 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD