Code

Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 20 Aug 2008 07:20:56 +0000 (09:20 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 20 Aug 2008 07:20:56 +0000 (09:20 +0200)

Trivial merge