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

Merge branch 'upstream'
---

df1906dbe2c8ab01af53ec5fb6cb70230e076412