Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Sat, 24 Apr 2010 15:51:15 +0000 (16:51 +0100)
committerStephen Gran <steve@lobefin.net>
Sat, 24 Apr 2010 15:51:15 +0000 (16:51 +0100)

Trivial merge