From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Mon, 3 Mar 2008 14:06:33 +0000 (+0100)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=1cae9cae0867586cf3254466d25840892d6aa82f;p=deb%2Fpackages.git

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

1cae9cae0867586cf3254466d25840892d6aa82f