Merge branch 'master' of ssh://db.debian.org/org/db.debian.org/git/dsa-nagios
authorStephen Gran <steve@lobefin.net>
Fri, 2 Apr 2010 15:56:26 +0000 (16:56 +0100)
committerStephen Gran <steve@lobefin.net>
Fri, 2 Apr 2010 15:56:26 +0000 (16:56 +0100)

Trivial merge