Merge branch 'collectd-4.0' into collectd-4.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 2 Sep 2007 17:28:25 +0000 (19:28 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 2 Sep 2007 17:28:25 +0000 (19:28 +0200)

Trivial merge