From: Gerfried Fuchs <rhonda@debian.org>
Date: Wed, 3 Nov 2010 13:24:01 +0000 (+0100)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=f862c13f95547609782da3d9a30ed5c50d8a62d7;hp=2b5f96ff935a1ee866f76d6d35f48e9f2393a622;p=deb%2Fpackages.git

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