From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 10 Jan 2010 00:01:27 +0000 (+0100)
Subject: Merge remote branch 'stew/contents' into merge
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d8c51ff9eb9d3eb3f0d5245488095789d79b047;p=dak

Merge remote branch 'stew/contents' into merge

* stew/contents:
  o.type -> ot.type

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

2d8c51ff9eb9d3eb3f0d5245488095789d79b047