Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Fri, 23 Oct 2009 13:59:48 +0000 (15:59 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 23 Oct 2009 13:59:48 +0000 (15:59 +0200)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  raff doesn't have enough disk to do the usual daemon log for bind
  and on the way in
  penalosa is a buildd and gets mail relay


Trivial merge