Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Fri, 30 Jul 2010 16:35:52 +0000 (18:35 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 30 Jul 2010 16:35:52 +0000 (18:35 +0200)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  sibelius gets ferm


Trivial merge