Imported Debian patch 3.0-2

No match.