Merge branch 'master' of /srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Sun, 23 May 2010 13:16:01 +0000 (13:16 +0000)
committerStephen Gran <steve@lobefin.net>
Sun, 23 May 2010 13:16:01 +0000 (13:16 +0000)

Trivial merge