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

Merge branch 'upstream'
---

1011125442839e1dcca4fd04c64c4d0810f281c7