Merge branch 'master' of git://git.debian.org/mirror/dsa-puppet
authorPhilipp Kern <pkern@debian.org>
Sat, 19 Mar 2011 14:09:18 +0000 (15:09 +0100)
committerPhilipp Kern <pkern@debian.org>
Sat, 19 Mar 2011 14:09:18 +0000 (15:09 +0100)

Trivial merge