From: Gerfried Fuchs <rhonda@debian.at>
Date: Sun, 10 Oct 2010 15:53:22 +0000 (+0200)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=699944734d65358e66319300ec29dc7084f54ed0;hp=699944734d65358e66319300ec29dc7084f54ed0;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master
---