Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  vivaldi → squeeze
  argento → squeeze
  samhain on caballero is also broken
  merulo → squeeze
  caballero → squeeze
  arnold → squeeze
  rietz no longer has a /vicepa
  change to a different gw for csail
  berlioz does https
  agricola, abel → squeeze
  arcadelt → squeeze
  antheil → squeeze

diff --cc config/nagios-master.cfg
Simple merge