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

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  fix typo
  add faw, add gw for santoro Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  add santoro, yes, i know we need to fix the gw Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  piatti to squeeze
  I can't believe that has ever worked
  kassia squeeze Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  tchaikovsky to squeeze
  scelsi to squeeze
  rossini now squeeze
  typo Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  rem has a new IP Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  arne on squeeze
  oops, bad steve writing bad yaml
  new check for mail queue size on heavy_exim
  except it has a different hostgroup name
  kokkonen has apache now
  make nagios shut up Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  englund has apache now

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