[glpi-data-injection/el6] (7 commits) ...fix merge

[Remi Collet]

Summary of changes:

  0c6aa24... Fix typo that causes a failure to update the common directo (*)
  b4d2d48... update to 1.7.2 (bugfix) + fix for Source audit (*)
  a9af810... dist-git conversion (*)
  e3fc502... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  d74296f... update to 2.0.2 for GLPI 0.78 (*)
  61291ae... update to 2.1.2 for GLPI 0.80 (*)
  d4b86e7... fix merge

(*) This commit already existed in another branch; no separate mail sent