From: Sebastian Harl <sh@tokkee.org>
Date: Mon, 13 Apr 2009 21:05:49 +0000 (+0200)
Subject: Merge branch 'master' into etch-backports
X-Git-Tag: collectd-4.6.3-1--bpo40+1~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d29c55a6d7106a1eb41ff98251b6610a7c0edb6e;p=pkg-collectd.git

Merge branch 'master' into etch-backports
---

d29c55a6d7106a1eb41ff98251b6610a7c0edb6e