Merge branch 'pull/collectd-4.0' into collectd-4.0
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 3 Sep 2007 14:00:23 +0000 (16:00 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 3 Sep 2007 14:00:23 +0000 (16:00 +0200)

Trivial merge