From: Bdale Garbee <bdale@gag.com>
Date: Tue, 7 Sep 2010 15:03:49 +0000 (-0600)
Subject: Merge commit 'upstream/1.7.4p4'
X-Git-Tag: debian/1.7.4p4-1~12
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=599b9cba883f6308232ec634819df2a3a20fc731;p=debian%2Fsudo

Merge commit 'upstream/1.7.4p4'
---

599b9cba883f6308232ec634819df2a3a20fc731