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

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  another merge failure

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

a13bb1a6f59fe5f497b125da3764da72081a7ab2