Imported Upstream version 2.4.7
Imported Debian patch 2.4.7-1ubuntu1
Merge branch 'debian'

Conflicts:
	debian/apache2.2-common.postinst
	debian/changelog
	debian/control
	debian/patches/series
	debian/rules
Local changes for log permissions etc.