Imported Debian patch 1:5.1.20080914-1.2