From: Gerfried Fuchs <rhonda@debian.at>
Date: Mon, 30 Aug 2010 18:24:03 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=3fea9935b57097d1275b3139dd3dc89e07dfcf5e;hp=3fea9935b57097d1275b3139dd3dc89e07dfcf5e;p=deb%2Fpackages.git

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