Imported Debian patch 2.3.2-1ubuntu0.2