Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Fri, 17 Jun 2011 14:29:31 +0000 (15:29 +0100)
committerStephen Gran <steve@lobefin.net>
Fri, 17 Jun 2011 14:29:31 +0000 (15:29 +0100)

Trivial merge