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

Trivial merge