Merge branch 'master' into senslab2
Nicolas Turro [Fri, 25 Nov 2011 09:43:36 +0000 (10:43 +0100)]
1  2 
setup.py

diff --cc setup.py
Simple merge