From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sun, 4 Apr 2010 16:47:57 +0000 (-0400)
Subject: Merge
X-Git-Tag: SUDO_1_8_0~749
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb55653a4cb5641605fdbb3726f0fc10b6f719bd;p=sudo

Merge
---

fb55653a4cb5641605fdbb3726f0fc10b6f719bd