From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 25 Apr 2008 22:16:54 +0000 (+0200)
Subject: Merge
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=816480bf1b4bd66e6c07eabf0e5d8851cf3df20e;p=dak

Merge
---

816480bf1b4bd66e6c07eabf0e5d8851cf3df20e