Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 16 May 2010 16:20:32 +0000 (18:20 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 16 May 2010 16:20:32 +0000 (18:20 +0200)

Trivial merge