Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 16 Apr 2007 12:53:12 +0000 (14:53 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 16 Apr 2007 12:53:12 +0000 (14:53 +0200)

Trivial merge