Code

Merge commit 'octo/master'
authorSven Trenkel <collectd@semidefinite.de>
Thu, 1 Oct 2009 11:25:17 +0000 (13:25 +0200)
committerSven Trenkel <collectd@semidefinite.de>
Thu, 1 Oct 2009 11:25:17 +0000 (13:25 +0200)

Trivial merge