Merge branch 'pull/uni' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 5 Feb 2007 19:01:27 +0000 (20:01 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 5 Feb 2007 19:01:27 +0000 (20:01 +0100)

Trivial merge