Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Fri, 24 Jul 2009 09:25:29 +0000 (11:25 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 24 Jul 2009 09:25:29 +0000 (11:25 +0200)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Hi, my name is Steve, and I can read


Trivial merge