ref: 9fbb1d4350781f73d95fefcb3cce32bd04b57793
parent: eccfca5165f24e322135898c079319030a8b7ecc
parent: db8f0d2ca90929ac3e6fb63ef05651a71dd574ba
author: John Koleszar <jkoleszar@google.com>
date: Tue Jul 26 20:05:06 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: I1ae82458536ba2f0969e1bea78f41cd16fe96b79