Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: (21 commits)
  Revert "pettersson has bpo acpid"
  Revert "pettersson has bpo acpid"
  pettersson has bpo acpid
  mayer has new kernel and linux-base now
  new-ftp-master starts with a firewall
  Add franck.debian.org
  update authorized_keys
  and an rsync rule
  BT seeding should be on v6 as well
  a few powell  specific rules
  powell gets ferm
  add limit_bing rule
  paer now has linux-base
  all hosts have root: debian-admin@d.o in /etc/aliases, we don't need it here
  add %porter-mips
  quote link target
  add kill link
  and enable monit from inittab: what could go wrong?
  define init q command
  spurious whitespace change
  ...

diff --cc modules/sudo/files/common/sudoers
Simple merge