Merge branch 'thgeneric' into senslab2

diff --combined setup.py
index d6fd9e1,698b388..6e021ab
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -12,8 -12,8 +12,8 @@@ from distutils.core import setu
  bins = [ 
      'config/sfa-config-tty',
      'config/gen-sfa-cm-config.py',
-     'sfa/plc/sfa-import-plc.py', 
-     'sfa/plc/sfa-nuke-plc.py', 
+     'sfa/importer/sfa-import-plc.py', 
+     'sfa/importer/sfa-nuke-plc.py', 
      'sfa/server/sfa-ca.py', 
      'sfa/server/sfa-start.py', 
      'sfa/server/sfa-clean-peer-records.py', 
@@@ -44,8 -44,8 +44,9 @@@ package_dirs = 
      'sfa/generic',
      'sfa/managers',
      'sfa/managers/vini',
+     'sfa/importer',
      'sfa/plc',
 +    'sfa/senslab',
      'sfa/rspecs',
      'sfa/rspecs/elements',
      'sfa/rspecs/elements/versions',