Code

Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 25 Nov 2010 10:51:17 +0000 (11:51 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 25 Nov 2010 10:51:17 +0000 (11:51 +0100)

Trivial merge