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

Merge branch 'upstream'
---