Merge branch 'collectd-4.3' of /var/lib/git/collectd into collectd-4.3
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 07:25:46 +0000 (09:25 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 07:25:46 +0000 (09:25 +0200)

Trivial merge