Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Thu, 25 Feb 2010 19:24:14 +0000 (19:24 +0000)
committerStephen Gran <steve@lobefin.net>
Thu, 25 Feb 2010 19:24:14 +0000 (19:24 +0000)

Trivial merge