Imported Debian patch 1.0.11~git-20070212-1