Code

Merge branch 'master' of http://git.tokkee.org/pkg-collectd
authorSebastian Harl <sh@tokkee.org>
Wed, 2 May 2007 17:56:45 +0000 (19:56 +0200)
committerSebastian Harl <sh@tokkee.org>
Wed, 2 May 2007 17:56:45 +0000 (19:56 +0200)

Trivial merge