Merge 42c94791 from open-source master

Change-Id: Id17a1a787b6d46c44ba39d628129a3a27f6d70be
This commit is contained in:
Jean-Baptiste Queru 2010-11-04 07:22:33 -07:00
commit ea4f07f93a

Diff Content Not Available