merged master onto senslab2, manually solved conflicts in setup.py
Thierry Parmentelat [Thu, 3 Nov 2011 14:59:18 +0000 (15:59 +0100)]
(under control) and rspec.py (now in sfa/rspecs), the latter being the
mainstream version as is

1  2 
setup.py
sfa/trust/auth.py

diff --cc setup.py
+++ b/setup.py
@@@ -36,17 -36,18 +36,19 @@@ bins = 
  
  package_dirs = [
      'sfa', 
-     'sfa/client',
-     'sfa/methods',
-     'sfa/plc',
-     'sfa/senslab',
-     'sfa/server',
      'sfa/trust',
      'sfa/util', 
+     'sfa/client',
+     'sfa/server',
+     'sfa/methods',
+     'sfa/generic',
      'sfa/managers',
      'sfa/managers/vini',
+     'sfa/plc',
++    'sfa/senslab',
      'sfa/rspecs',
      'sfa/rspecs/elements',
+     'sfa/rspecs/elements/versions',
      'sfa/rspecs/versions',
      'sfatables',
      'sfatables/commands',
Simple merge