Merge remote branch 'tokkee/sh/collectd-4.9' into collectd-4.9
authorFlorian Forster <octo@noris.net>
Wed, 9 Jun 2010 08:38:55 +0000 (10:38 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 9 Jun 2010 08:38:55 +0000 (10:38 +0200)

Trivial merge