Imported Debian patch 2.4.7-1ubuntu4
Imported Debian patch 2.4.7-1ubuntu4
Merge branch 'debian' - upgrade to most recent ubuntu upstream.