Remove a bunch of really ill thought out Apache2 control code
Allow Apache2-Prefork-Dev to be installed without starting via apt
Apache2 with fewer boot time hacks
Merge branch 'master' into stable