Code

Merge branch 'pull/collectd-4.0' into collectd-4.0
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 28 Sep 2007 14:42:13 +0000 (16:42 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 28 Sep 2007 14:42:13 +0000 (16:42 +0200)

Trivial merge