filetransfer: merge from trunk, resolve conflict
tree7d4128420177ea0e79305ca100855d4c638f43e2
-rw-r--r-- 123 .arch-inventory
-rw-r--r-- 636 .darcs-boring
-rw-r--r-- 678 CREDITS
-rw-r--r-- 283139 ChangeLog
-rw-r--r-- 459 MANIFEST.in
-rw-r--r-- 1324 Makefile
-rw-r--r-- 76970 NEWS
-rw-r--r-- 8071 README
-rw-r--r-- 4053 README.w32
drwxr-xr-x - bin
drwxr-xr-x - buildbot
drwxr-xr-x - contrib
drwxr-xr-x - docs
-rw-r--r-- 2882 setup.py