Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

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:
  Kill christoph IP addresses per request
  Add pejacevic dedication
  Dist nsswitch.conf from puppet
  Add wwids for pejacevic and -srv
  Try to find config harder
  Produce different schroot config files depending on distro
  Make schroot scripts work on wheezy
  Only source /etc/schroot/default/config if it exists