Merge from open-source master

Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
This commit is contained in:
Jean-Baptiste Queru 2010-12-02 07:54:49 -08:00
commit af8964280b

Diff Content Not Available