Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 19 Jul 2009 11:16:25 +0000 (13:16 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 19 Jul 2009 11:16:25 +0000 (13:16 +0200)

Trivial merge