ref: ffdfbe2bbaf6f12d25517168e5f18431f568c53d
parent: fd599efb25cceaed9d6ddd2dab26cd47cf3b33f8
 parent: be3dee8903fda70d82b3cfc84f6427b2bdc48d38
	author: John Koleszar <jkoleszar@google.com>
	date: Fri Apr  8 20:05:08 EDT 2011
	
Merge remote branch 'internal/upstream-experimental' into HEAD
--
⑨