From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 26 Oct 2009 13:34:18 +0000 (+0100)
Subject: Merge commit 'mhy/master' into merge
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=776229f5bed50af6c2432f188c1131b5ef05185c;p=dak

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  fix bad merge

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

776229f5bed50af6c2432f188c1131b5ef05185c