From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 11 Jan 2011 22:39:48 +0000 (+0100)
Subject: Merge remote branch 'drkranz/overrides' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=inline;h=be11dfd4b92f3ae0aabdb952afccb8f7a6824f9f;hp=--cc;p=dak.git

Merge remote branch 'drkranz/overrides' into merge

* drkranz/overrides:
  Avoid converting unicode strings into yaml nodes
  override.py: fix typo, spotted by Holger Levsen

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

be11dfd4b92f3ae0aabdb952afccb8f7a6824f9f