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

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  aha, that was subtle
  clean up some duplicates
  vivaldi/fossology has gone away
  as has sperger
  this has been down for 6 months
  no more bellini
  Different buildd check for fbsd hosts
  Different thresholds for /srv on beach
  add fils
  autofs on ullmann
  Change gw-1&1
  ullmann also has apaches

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