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

Merge branch 'upstream'
---

f17a7d4e9c876f17294d1bc682ba6998288189f2