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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Try to configure ntpdate for hosts with broken RTC
  Revert "get rid of the apt repo until they fix it" - aba says it's all fixed
  Revert "This is part two of d93775534f19bde42d75c6debe391cc701c54993"
  Add sompek.debian.org
  This is part two of d93775534f19bde42d75c6debe391cc701c54993 Signed-off-by: Stephen Gran <steve@lobefin.net>
  get rid of the apt repo until they fix it
  That cast rather too broad a net, I think Signed-off-by: Stephen Gran <steve@lobefin.net>
  add some autopostgres munin stuff
  no more pescetti
  one more we ship with puppet
  try some dependency ordering
  add a preferences file for buildd/schroot
  another file that gets autoupdated
  new buildds
  Sort list Signed-off-by: Stephen Gran <steve@lobefin.net>
  Let's try one last time to get it right. Signed-off-by: Stephen Gran <steve@lobefin.net>
  comparison of Fixnum with String failed Signed-off-by: Stephen Gran <steve@lobefin.net>
  Obvious syntax error ... Signed-off-by: Stephen Gran <steve@lobefin.net>
  this may break a lot ...

diff --cc modules/debian-org/misc/local.yaml
Simple merge