Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Tue, 27 Jul 2010 08:00:39 +0000 (09:00 +0100)
committerStephen Gran <steve@lobefin.net>
Tue, 27 Jul 2010 08:00:39 +0000 (09:00 +0100)

Trivial merge