From: Florian Forster <octo@leeloo.home.verplant.org>
Date: Tue, 1 Jul 2008 10:01:46 +0000 (+0200)
Subject: Merge branch 'master' into ff/rrdd
X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=commitdiff_plain;h=c68ae5a3674d315df30bc7729b3d89fa7ab83923

Merge branch 'master' into ff/rrdd
---

c68ae5a3674d315df30bc7729b3d89fa7ab83923