Code

Merge remote branch 'tokkee/sh/collectd-4.7' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 11 May 2009 14:18:22 +0000 (16:18 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 11 May 2009 14:18:22 +0000 (16:18 +0200)

Trivial merge