Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Sun, 2 Aug 2009 22:02:01 +0000 (23:02 +0100)
committerStephen Gran <steve@lobefin.net>
Sun, 2 Aug 2009 22:02:01 +0000 (23:02 +0100)

Trivial merge