Code

Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2011 01:34:00 +0000 (21:34 -0400)
committerFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2011 01:34:00 +0000 (21:34 -0400)

Trivial merge