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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  temporary hack to allow mail to rt-3520
  use submission port for zappa
  make zappa a buildd for puppet purposes
  template within template?  better not
  set edns buffer size to 512 on zappa
  Add zappa
  ignore dpkg on grieg
  Add blavet