Code

Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 6 May 2009 08:44:00 +0000 (10:44 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 6 May 2009 08:44:00 +0000 (10:44 +0200)

Trivial merge