From: Mark Hymers <mhy@debian.org>
Date: Wed, 8 Apr 2009 20:48:29 +0000 (+0100)
Subject: Merge commit 'ftpmaster/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee00ba60099f741819f991db13b4d0fc65bdd960;p=dak

Merge commit 'ftpmaster/master'
---

ee00ba60099f741819f991db13b4d0fc65bdd960