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

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  add gabrielli
  paganini has nfs-client
  escher and malo seem to be out
  I really meant tchaikovsky ..
  Revert "and tchaikovsky"
  and tchaikovsky
  handel now has ulog
  peri too
  even more
  and more
  more ulog hosts
  some more ulog hosts
  caballero now has udev

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