ref: 86edcb0cc78fac2c3c086702fa98934e690bc290
parent: ffc4587a47bf9a12e867310da8060662d08c0da2
parent: 4ab3175b123b6804029efc14f98d87c491e130d1
author: John Koleszar <jkoleszar@google.com>
date: Wed Jul 13 20:05:11 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: I3f64e220b78738e5261a9fda3c270d51613f4faa