ref: 6251e9e5cee546c3b20cdc3498d43e0204db97b9
parent: fe5765a5f3e1edbd3fc851e8b32e8b6eee35f37a
parent: 034cea5e726b851294baad4d77e81bb6ce45703c
author: John Koleszar <jkoleszar@google.com>
date: Wed Jun 29 20:05:10 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: I35c9ca116aecd0d03e762942d9cf1289edb4f23d