[MERGE]
tree52413f051b2080a9592fd595b2882ab202dc2c7e
-rw-r--r-- 52 .bzrignore
-rw-r--r-- 400 MANIFEST.in
-rw-r--r-- 1120 README
drwxr-xr-x - bin
drwxr-xr-x - doc
drwxr-xr-x - man
drwxr-xr-x - pixmaps
-rw-r--r-- 673 rpminstall_sh.txt
-rw-r--r-- 335 setup.cfg
-rw-r--r-- 9859 setup.nsi
-rwxr-xr-x 7635 setup.py
drwxr-xr-x - win32