From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 22 Jan 2007 21:36:40 +0000 (+0100)
Subject: Merge branch 'ff/entropy' into collectd-4
X-Git-Tag: collectd-4.0.0~213^2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=4f27b7128f48771fb28de092cf56759bf6cb7f45

Merge branch 'ff/entropy' into collectd-4
---

4f27b7128f48771fb28de092cf56759bf6cb7f45