Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...
authorMartin Zobel-Helas <zobel@ftbfs.de>
Wed, 1 Jul 2009 14:43:59 +0000 (16:43 +0200)
committerMartin Zobel-Helas <zobel@ftbfs.de>
Wed, 1 Jul 2009 14:43:59 +0000 (16:43 +0200)

Trivial merge