Code

Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd...
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Jul 2006 20:34:27 +0000 (22:34 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Jul 2006 20:34:27 +0000 (22:34 +0200)

Trivial merge