Code

Merge branch 'collectd-4.0'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 6 Jun 2007 15:37:12 +0000 (17:37 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 6 Jun 2007 15:37:12 +0000 (17:37 +0200)

Trivial merge