From: Bdale Garbee <bdale@gag.com>
Date: Tue, 3 Aug 2010 03:25:41 +0000 (-0400)
Subject: Merge commit 'upstream/1.7.4'
X-Git-Tag: debian/1.7.4p4-1~17
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=e8c052b72a5847683684a87315540fdf1f525d9c;p=debian%2Fsudo

Merge commit 'upstream/1.7.4'
---

e8c052b72a5847683684a87315540fdf1f525d9c