Code

Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@noris.net>
Wed, 13 Jan 2010 11:10:20 +0000 (12:10 +0100)
committerFlorian Forster <octo@noris.net>
Wed, 13 Jan 2010 11:10:20 +0000 (12:10 +0100)

Trivial merge