From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 21 Nov 2009 18:14:49 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.4.2-1~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e65c0007d4220bdd32cba826d8adb463bf32afd6;p=pkg-rrdtool.git

Merge branch 'upstream'
---

e65c0007d4220bdd32cba826d8adb463bf32afd6