ref: cadb2d66512c07a54fdf802983ddf2eddb26dbf4
parent: e965d8f6f3d7079bbccac975e057d2b2daa0e20c
parent: 5c756005aaa17759485552edaea3e9ff99760bac
author: John Koleszar <jkoleszar@google.com>
date: Fri May 6 20:05:11 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: I22f61430b52348b32078253d5ef38e68e7f91939