From: Bdale Garbee <bdale@gag.com>
Date: Thu, 11 Mar 2010 18:49:52 +0000 (-0700)
Subject: Merge commit 'upstream/1.7.2p5'
X-Git-Tag: debian/1.7.2p5-1~7
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=f96858dfa76bdecf85912bce766954e31b050def;p=debian%2Fsudo

Merge commit 'upstream/1.7.2p5'
---

f96858dfa76bdecf85912bce766954e31b050def