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

Merge branch 'upstream'
---

607afdb16c4ac0a31b43f3039eb64fd889c544b5