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

Merge branch 'upstream'
---

67cb7c5d2dc193713d0a7d9d44070e5c7471ab8a