Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Mon, 30 Aug 2010 07:11:56 +0000 (09:11 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 30 Aug 2010 07:11:56 +0000 (09:11 +0200)

Trivial merge