Merge branch 'master' into senslab2
Sandrine Avakian [Wed, 14 Mar 2012 09:38:27 +0000 (10:38 +0100)]
1  2 
setup.py

diff --cc setup.py
Simple merge