From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 9 Jan 2010 22:43:38 +0000 (+0100)
Subject: Merge branch 'merge'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c6cd875326cabaf5d9670fe9769b9cf3786552e;p=dak

Merge branch 'merge'

* merge:
  fixes from some previous bad merge
---

5c6cd875326cabaf5d9670fe9769b9cf3786552e