From: Gerfried Fuchs <rhonda@debian.at>
Date: Tue, 18 May 2010 18:05:22 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/2.97-1~1
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=317f6247fff5c0cb53bf4218daaaa424e544e704;p=pkg%2Ft-prot.git

Merge branch 'upstream'
---

317f6247fff5c0cb53bf4218daaaa424e544e704