Code

Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 9 Feb 2008 16:46:48 +0000 (17:46 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 9 Feb 2008 16:46:48 +0000 (17:46 +0100)

Trivial merge