ref: 2c3c54f7475021e2fbc62998b042e54efa9f142c
parent: 61d9d595d5d42790cdead1332d87aaf663a57acf
parent: 973a9c075d2db817e489f5ba050fc49963bf2c71
author: John Koleszar <jkoleszar@google.com>
date: Thu Jul 7 20:05:04 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: I9cead934ebea85d81aceaaec4674efc74367f984