ref: 4ec081a7de6dfa6cd4d27b08a6881fd747055d4d
parent: ae74199ecf46086ec245506a570052e7310bdb24
parent: 786246ebf1fd4b875f33a8b0c35bab2a3df911b3
author: John Koleszar <jkoleszar@google.com>
date: Wed Jun 22 20:05:04 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD