Merge branch 'collectd-4.9'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 18 Dec 2009 10:26:52 +0000 (11:26 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 18 Dec 2009 10:26:52 +0000 (11:26 +0100)

Trivial merge