Code

Merge branch 'collectd-4.5'
authorFlorian Forster <octo@noris.net>
Fri, 28 Nov 2008 11:00:15 +0000 (12:00 +0100)
committerFlorian Forster <octo@noris.net>
Fri, 28 Nov 2008 11:00:15 +0000 (12:00 +0100)

Trivial merge