Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Wed, 18 Aug 2010 21:29:51 +0000 (22:29 +0100)
committerStephen Gran <steve@lobefin.net>
Wed, 18 Aug 2010 21:29:51 +0000 (22:29 +0100)

Trivial merge