import debian/ dir from latest sid
Merge branch 'master' into bp/precise

Conflicts:
	debian/changelog
	debian/control
	debian/patches/series
fix apache dependency