Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Wed, 9 Dec 2009 16:06:41 +0000 (17:06 +0100)
committerPeter Palfrader <peter@palfrader.org>
Wed, 9 Dec 2009 16:06:41 +0000 (17:06 +0100)

Trivial merge