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

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  we now have ulogd on all except sparc and freebsd
  more ulogd-hosts
  more ulogd-hosts
  more ulogd-hosts
  more ulogd-hosts
  more ulogd-hosts
  ferm needs ulogd
  Revert "Revert "add firewall check""
  Revert "add firewall check"
  remove LEVEL from printf
  add firewall check
  initialize LEVEL
  add an optional -w
  minor tweaks
  release dsa-nagios-checks (87)
  Add checks/dsa-checks-file
  Some initial BSD support in dsa-check-running-kernel

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