From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Mon, 21 Jan 2008 19:54:30 +0000 (+0100)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=628573c1d7d7f838b6022cc8c855c7ef6c6d045f;hp=-c;p=deb%2Fpackages.git

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

628573c1d7d7f838b6022cc8c855c7ef6c6d045f