octo@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk
authorocto <octo>
Fri, 16 Jun 2006 23:02:01 +0000 (23:02 +0000)
committerocto <octo>
Fri, 16 Jun 2006 23:02:01 +0000 (23:02 +0000)

Trivial merge