Imported Upstream version 2.5.1e
Imported Debian patch 2.5.1e-1