Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Sun, 5 Feb 2012 20:07:16 +0000 (20:07 +0000)
committerStephen Gran <steve@lobefin.net>
Sun, 5 Feb 2012 20:07:16 +0000 (20:07 +0000)

Trivial merge