ref: f13212b72817ec5e8ec90f8375b98d1515eab27b
parent: 95a86dd007ee53170a25e8406c1d09e40cdbe78a
parent: b2ae57f1b6cbbf018d356528bd8e816752dbbfb7
author: John Koleszar <jkoleszar@google.com>
date: Thu Feb 17 19:05:13 EST 2011
Merge remote branch 'internal/upstream' into HEAD