From: Bdale Garbee <bdale@gag.com>
Date: Wed, 1 Jul 2009 18:46:39 +0000 (-0300)
Subject: Merge branch 'upstream' into dfsg-orig
X-Git-Tag: debian/1.22-1.1~1^2
X-Git-Url: https://git.gag.com/?p=debian%2Ftar;a=commitdiff_plain;h=d5a7e356d395fe65871629bb9f7ddc17e1bebada

Merge branch 'upstream' into dfsg-orig
---

d5a7e356d395fe65871629bb9f7ddc17e1bebada