Code

Merge branch 'collectd-4.9'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Dec 2009 12:13:53 +0000 (13:13 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Dec 2009 12:13:53 +0000 (13:13 +0100)

Trivial merge