Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet