Merge commit 'tokkee/sh/collectd-4.9' into collectd-4.9
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:50:22 +0000 (11:50 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 5 Jan 2010 10:50:22 +0000 (11:50 +0100)

Trivial merge