Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 20 Apr 2007 14:16:27 +0000 (16:16 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 20 Apr 2007 14:16:27 +0000 (16:16 +0200)

Trivial merge