Merge branch 'collectd-4.6' of /var/lib/git/collectd into collectd-4.6
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 17 Mar 2009 08:29:06 +0000 (09:29 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 17 Mar 2009 08:29:06 +0000 (09:29 +0100)

Trivial merge