Code

Merge remote branch 'origin/collectd-4.9' into collectd-4.9
authorFlorian Forster <octo@noris.net>
Wed, 19 May 2010 08:47:58 +0000 (10:47 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 19 May 2010 08:47:58 +0000 (10:47 +0200)

Trivial merge