Merge branch 'collectd-4.8'
authorFlorian Forster <octo@noris.net>
Wed, 21 Oct 2009 09:36:17 +0000 (11:36 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 21 Oct 2009 09:36:17 +0000 (11:36 +0200)

Trivial merge