Merge branch 'v391-fix' into v392-fix collectd-3.9.2
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 25 Jun 2006 08:51:57 +0000 (10:51 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 25 Jun 2006 08:51:57 +0000 (10:51 +0200)

Trivial merge