ref: fe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a
parent: d83b68c62296eee867bdd6b5fd299ad1706e624a
parent: dc004e8c17a1f330ed46eab092ca67e6f785fee1
author: John Koleszar <jkoleszar@google.com>
date: Tue Jun 28 20:05:09 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: I68e604e4a731f6703fdec7eff2c2c9b9e36879ea