manual merge of 547b902e

Change-Id: Ibfc409f53a82bc7cb5caa6aaf94e18589e06009b
This commit is contained in:
Jean-Baptiste Queru 2010-10-10 12:00:02 -07:00
commit eef1d7d422

Diff Content Not Available