Merge branch 'collectd-4.3'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 3 Apr 2008 07:39:03 +0000 (09:39 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 3 Apr 2008 07:39:03 +0000 (09:39 +0200)

Trivial merge