From: Gerfried Fuchs <rhonda@debian.at>
Date: Thu, 1 Jul 2010 19:17:02 +0000 (+0200)
Subject: Merge commit 'upstream/2.99'
X-Git-Tag: debian/2.99-1~4
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=inline;h=d9b81b887c55439e5fd2e4c1eaac478f98cdc5bf;p=pkg%2Ft-prot.git

Merge commit 'upstream/2.99'
---

d9b81b887c55439e5fd2e4c1eaac478f98cdc5bf