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

Merge
---

8bfa86fcdf3bf49af79e239115a815f2d5998c8e