From: Torsten Werner <twerner@debian.org>
Date: Thu, 11 Aug 2011 20:42:27 +0000 (+0200)
Subject: Merge branch 'master' into rm
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adcc4dcadd87c31ca52c4ec6b485375b56579e46;p=dak

Merge branch 'master' into rm
---

adcc4dcadd87c31ca52c4ec6b485375b56579e46