From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 26 Mar 2008 23:43:50 +0000 (+0100)
Subject: Merge from mainline
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7db94a5175b28a4e923a25d7d396f622ade42229;p=dak

Merge from mainline
---

7db94a5175b28a4e923a25d7d396f622ade42229