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

Merge remote branch 'stew/contents' into merge

* stew/contents:
  fixes from some previous bad merge

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

48a1d3f8272ad4391a693b0239ff8a8853e6ce20