Code

Merge branch 'collectd-4.0' into collectd-4.1
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 27 Sep 2007 13:34:00 +0000 (15:34 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 27 Sep 2007 13:34:00 +0000 (15:34 +0200)

Trivial merge