ref: 573a3f35eaed30a986a9d97905f05881f602bf9c
parent: 5380a2215e49f88d4db5e13997055717faec8d1c
parent: 61d9d595d5d42790cdead1332d87aaf663a57acf
author: John Koleszar <jkoleszar@google.com>
date: Sat Jul 2 20:05:05 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD