From: Torsten Werner <twerner@debian.org>
Date: Wed, 7 Jul 2010 21:40:03 +0000 (+0000)
Subject: Merge branch 'master' into show-new
X-Git-Tag: debian-r/squeeze~643^2~4^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=317c4c7f173540de71907f1e527437d88f48a3b9;p=dak.git

Merge branch 'master' into show-new
---

317c4c7f173540de71907f1e527437d88f48a3b9