From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Wed, 6 Aug 2008 05:38:04 +0000 (+0200)
Subject: Merge commit 'origin/master' into archive-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=547737cf56224b3bfd95822cebe01890fdc7e829;p=deb%2Fpackages.git

Merge commit 'origin/master' into archive-master
---

547737cf56224b3bfd95822cebe01890fdc7e829