ref: ffc4587a47bf9a12e867310da8060662d08c0da2
parent: 6058c9ce0cd8305b13a4766370c67059f789b816
parent: 587ca06da9d652d60309679c14a1c0b310c93c66
author: John Koleszar <jkoleszar@google.com>
date: Tue Jul 12 20:05:04 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: I9dab62c24d71f71cdc36732ed8ed469bee67d7e1