* fix wrong policy writing in the apache2-dev modules - I don't think they're necessary here cc @leehambley
netatalk update!
use smbpasswd instead of tdsam ...
Remove policy-rc.d from apache2 deps
* no init style scripts for netatalk
Tweaks around samba/netatalk
Do this as root, for safety
Safer stop scripts for upstart
Merge branch 'master' into stable