Imported Debian patch 0.9.4-1.1
Merge tag 'debian/0.9.4-1.1'

Debian release 0.9.4-1.1

Conflicts:
	debian/changelog (insert NMU stanza)
	debian/control (ordering of dependencies)