ref: 6058c9ce0cd8305b13a4766370c67059f789b816
parent: 2c3c54f7475021e2fbc62998b042e54efa9f142c
parent: e83d36c053199693eadac5774b47d17416cb8954
author: John Koleszar <jkoleszar@google.com>
date: Fri Jul 8 20:05:09 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: Ica63d16cb39e2d65a3414f0b9f86c8a64112dfa3