From: Torsten Werner <twerner@debian.org>
Date: Sun, 30 Jan 2011 18:22:43 +0000 (+0100)
Subject: Merge branch 'master' into dbtests
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=504d14a6c25d43017c8a6a44f299819f2f1341e5;p=dak

Merge branch 'master' into dbtests
---

504d14a6c25d43017c8a6a44f299819f2f1341e5