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

Trivial merge