Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
start replacing removed package references with references to debian.org package
oops, need this one. Put it back as well
oops, need this one. Put it back as well
oops, need this one. Put it back as well
oops, need this one. Put it back in the right module
add debian.org to manifest and remove a bunch of stuff it depends on
directory wants package installed first
pescetti to squeeze