Merge branch 'uni/collectd-4.0' into collectd-4.0
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 11 Sep 2007 09:45:50 +0000 (11:45 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 11 Sep 2007 09:45:50 +0000 (11:45 +0200)

Trivial merge