Merge changes I0f07f6ae,Icb6a062e,I2dcf8cf6,If0ee2bce
-rw-r--r-- 39 .gitignore
-rw-r--r-- 851 Makefile
-rw-r--r-- 7 VERSION
drwxr-xr-x - distfiles
drwxr-xr-x - mic
drwxr-xr-x - plugins
-rw-r--r-- 2856 setup.py
drwxr-xr-x - tests
drwxr-xr-x - tools