ref: 7cb25d9c562e094c47f37ad34a94d5cafcba2ece
parent: c08e65a6718ee0c0caa837aaf668be6998d2c1e5
parent: b7a6f1d20e958ce4dbce4555637a5948390797b1
author: John Koleszar <jkoleszar@google.com>
date: Mon Aug 22 20:05:10 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: I84dfc81eb14caae02011be2b9fef18a8d7f803f4