From: Bdale Garbee <bdale@gag.com>
Date: Sun, 16 Jan 2011 02:31:36 +0000 (-0700)
Subject: Merge commit 'upstream/1.7.4p5'
X-Git-Tag: debian/1.7.4p6-1~8
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=99808054395c87b548bdb6b7cb1879bc23c535ad;p=debian%2Fsudo

Merge commit 'upstream/1.7.4p5'
---

99808054395c87b548bdb6b7cb1879bc23c535ad