Merge (ignore) from open-source master tree

Change-Id: Ie735c3282ddc17c1e28e1069b714f3a310c221a2
This commit is contained in:
Jean-Baptiste Queru 2010-08-31 13:08:11 -07:00
commit 97b06ef7dd

Diff Content Not Available