Code

Merge branch 'collectd-4.8'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Nov 2009 08:01:10 +0000 (09:01 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Nov 2009 08:01:10 +0000 (09:01 +0100)

Trivial merge