merged master onto senslab2, manually solved conflicts in setup.py
[sfa.git] / config / registries.xml
2009-07-02 Thierry Parmentelatcleaning up config files