[0.85] Apply previous


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.85-work@21051 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.85] partialy remove previous commit (not ready for the moment :D).


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.85-work@21052 35612d4c-9d10-0410-837c-bf9dd1be60d7