Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 5 Feb 2009 21:54:40 +0000 (22:54 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 5 Feb 2009 21:54:40 +0000 (22:54 +0100)

Trivial merge