Merge branch 'pull/collectd-3.11' into collectd-3.11
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 9 Feb 2007 16:55:49 +0000 (17:55 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 9 Feb 2007 16:55:49 +0000 (17:55 +0100)

Trivial merge