Merge branch 'collectd-4.5'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 24 Jan 2009 10:04:31 +0000 (11:04 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 24 Jan 2009 10:04:31 +0000 (11:04 +0100)

Trivial merge