From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Tue, 18 Sep 2007 21:18:28 +0000 (+0000)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=42a5a96dd0c539135f2e1cb044a91f9e2f441f5f;hp=--cc;p=deb%2Fpackages.git

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

42a5a96dd0c539135f2e1cb044a91f9e2f441f5f