From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Thu, 14 Feb 2008 19:58:55 +0000 (+0100)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=4b7ec0eac84d77a585d003ff9f358cc15c9f9996;p=deb%2Fpackages.git

Merge branch 'master' into debian-master
---

4b7ec0eac84d77a585d003ff9f358cc15c9f9996