From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 12 Apr 2008 20:13:58 +0000 (+0200)
Subject: Merge from upstream
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0c62ab4610b5f272816d49dcd7f5847fdb77b98;p=dak

Merge from upstream
---

d0c62ab4610b5f272816d49dcd7f5847fdb77b98