From: Sebastian Harl <sh@tokkee.org>
Date: Tue, 9 Jun 2009 16:16:48 +0000 (+0200)
Subject: Merge branch 'upstream' into experimental
X-Git-Tag: experimental/1.4--rc2+20091004~45
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a93b6b71c84ffda2b82a8dc5e56e01940d5a5bbe;p=pkg-rrdtool.git

Merge branch 'upstream' into experimental
---

a93b6b71c84ffda2b82a8dc5e56e01940d5a5bbe