From: Mark Hymers <mhy@debian.org>
Date: Wed, 28 Oct 2009 15:12:53 +0000 (+0000)
Subject: Merge commit 'ftpmaster/master'
X-Git-Tag: debian-r/squeeze~950^2~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4d3066e67fba1a377c78dd3a2fdfa196076720a0;p=dak.git

Merge commit 'ftpmaster/master'
---

4d3066e67fba1a377c78dd3a2fdfa196076720a0