Merge branch 'master' of git://git.onelab.eu/sfa into upmc

diff --combined setup.py
index 490b2e0,575dfd6..77e6658
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -38,6 -38,7 +38,7 @@@ packages = 
      'sfa/client',
      'sfa/planetlab',
      'sfa/nitos',
+     'sfa/dummy',
      'sfa/openstack',
      'sfa/federica',
      'sfatables',
@@@ -45,7 -46,7 +46,7 @@@
      'sfatables/processors',
      ]
  
 -initscripts = [ 'sfa', 'sfa-cm' ]
 +initscripts = [ 'functions', 'sfa', 'sfa-cm' ]
  
  data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml',
                                'config/registries.xml',