Merge branch 'pull/collectd-4.2' into collectd-4.2
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:30:26 +0000 (18:30 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 21 Jan 2008 17:30:26 +0000 (18:30 +0100)

Trivial merge