Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Wed, 28 Jul 2010 20:42:32 +0000 (22:42 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Wed, 28 Jul 2010 20:42:32 +0000 (22:42 +0200)

Trivial merge