Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Fri, 27 Aug 2010 07:40:10 +0000 (08:40 +0100)
committerStephen Gran <steve@lobefin.net>
Fri, 27 Aug 2010 07:40:10 +0000 (08:40 +0100)

Trivial merge