Fix big bug goneri have added because he has smoked the moquette...
Fix big bug goneri have added because he has smoked the moquette...

Conflicts:

	fusioninventory/inc/taskjob.class.php

orthagh/fusioninventory-for-glpi,dethegeek/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,dethegeek/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,dethegeek/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,fusioninventory/fusioninventory-for-glpi,orthagh/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,TECLIB/fusioninventory-for-glpi,dethegeek/fusioninventory-for-glpi,mohierf/fusioninventory-for-glpi,itinside/fusioninventory-for-glpi