From: Gerfried Fuchs <rhonda@debian.at>
Date: Sun, 11 Jul 2010 20:53:28 +0000 (+0200)
Subject: Merge commit 'upstream/2.100'
X-Git-Tag: debian/2.100-1~2
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=c00238e264f9b353012f4cd0a8fa09916b6e4fae;p=pkg%2Ft-prot.git

Merge commit 'upstream/2.100'
---

c00238e264f9b353012f4cd0a8fa09916b6e4fae