reintegrate source code of 0.8.0.6
Imported Debian patch 0.8.0.4-1.1
Imported Upstream version 0.8.0.5
Imported Upstream version 0.6.2.17