Code

Merge branch 'pull/collectd-4.1' into collectd-4.1
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Feb 2008 13:00:37 +0000 (14:00 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Feb 2008 13:00:37 +0000 (14:00 +0100)

Trivial merge