From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 7 Jun 2009 19:54:31 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=9a482e584a6b5337a90385ad1d54ae3190330dce;hp=9a482e584a6b5337a90385ad1d54ae3190330dce;p=deb%2Fpackages.git

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