Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sat, 19 Jun 2010 07:04:33 +0000 (09:04 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sat, 19 Jun 2010 07:04:33 +0000 (09:04 +0200)

Trivial merge