manual merge of 424de177

Change-Id: Iaff23131e9c0ba4de2fc15600f940aa0d23c59fd
This commit is contained in:
Jean-Baptiste Queru 2010-10-10 11:57:00 -07:00
commit 02a7a7a3ec

Diff Content Not Available