Code

Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 3 Apr 2007 07:05:19 +0000 (09:05 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 3 Apr 2007 07:05:19 +0000 (09:05 +0200)

Trivial merge