Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Mon, 21 Jun 2010 11:37:32 +0000 (13:37 +0200)
committerPeter Palfrader <peter@palfrader.org>
Mon, 21 Jun 2010 11:37:32 +0000 (13:37 +0200)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  fix typo
  add ulogd, acpid for heininen
  add heininen


Trivial merge