Imported Debian patch 2.4.39-1.1