Code

Merge branch 'master' of git://git.tokkee.org/pkg-collectd
authorSebastian Harl <sh@tokkee.org>
Tue, 16 Sep 2008 17:59:12 +0000 (19:59 +0200)
committerSebastian Harl <sh@tokkee.org>
Tue, 16 Sep 2008 17:59:12 +0000 (19:59 +0200)

Trivial merge