Merge branch 'pull/collectd-4.0' into collectd-4.0
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 24 Aug 2007 10:12:40 +0000 (12:12 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 24 Aug 2007 10:12:40 +0000 (12:12 +0200)

Trivial merge