From: Gerfried Fuchs <rhonda@debian.at>
Date: Wed, 17 Feb 2010 19:48:49 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/2.2-1~1
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=b0d9c2864745744a3d0266f0461770b006483bdb;p=pkg%2Ft-prot.git

Merge branch 'upstream'
---

b0d9c2864745744a3d0266f0461770b006483bdb