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:
  vsftpd plugin needs logtail
  vsftpd probably needs this, sigh
  add vsftpd stats pron
  let's blow ries' apache up
  more hosters
  Some debug output to make sure this works as I expect
  a few more hosters
  Add a prototype whohosts function for grouping machines at a common
  fix prototype deprecation warning
  try an experiment