Merge from open-source master

Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
This commit is contained in:
Jean-Baptiste Queru 2010-12-02 07:55:02 -08:00
commit 4bdada2c61

Diff Content Not Available