From: Mark Hymers <mhy@debian.org>
Date: Sat, 28 Feb 2009 21:38:55 +0000 (+0000)
Subject: Merge commit 'ftpmaster/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c11b7bd8cf8a93d4e0cbca31e02bdc6257fc4fc;p=dak

Merge commit 'ftpmaster/master'
---

1c11b7bd8cf8a93d4e0cbca31e02bdc6257fc4fc