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

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  Add SOA check for security.geo
  Add valente to nagios
  merkel seems to be running pg 8.3 now
  geo123 run bind now
  Add bugs trace checker
  -e is sufficient
  Changelog
  Erm, file needs to be executable.  Damn
  Copyright statement and make bad usage exit $UNKNOWN
  changelog entry
  Generalize (and simplify) the puppet file age check so that we can reuse
  Don't complain when installed version is higher than available version.
  Update the kernel check to not complain when we can't trace back to a meta package name - this generally indicates a custom kernel that we're running on purpose.

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