add another iana number for EMC
fix the test-suite, as decided on IRC :)
Merge branch 'master' of git+ssh://forge.fusioninventory.org/git/fusioninventory/agent
Merge branch 'master' into master+no_model_inventory