Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Wed, 3 Mar 2010 00:51:56 +0000 (00:51 +0000)
committerStephen Gran <steve@lobefin.net>
Wed, 3 Mar 2010 00:51:56 +0000 (00:51 +0000)

Trivial merge