Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Wed, 1 Jul 2009 13:10:37 +0000 (14:10 +0100)
committerStephen Gran <steve@lobefin.net>
Wed, 1 Jul 2009 13:10:37 +0000 (14:10 +0100)

Trivial merge