Merge branch 'pull/collectd-4.0' into collectd-4.0
authorFlorian Forster <octo@huhu.verplant.org>
Sun, 2 Sep 2007 15:55:38 +0000 (17:55 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Sun, 2 Sep 2007 15:55:38 +0000 (17:55 +0200)

Trivial merge