merge download changes from nautilus-dropbox-1.6.1/dropbox.in

http://linux.dropbox.com/packages/nautilus-dropbox-1.6.1.tar.bz2