Merge commit 'upstream/1.7.2p2'
authorBdale Garbee <bdale@gag.com>
Mon, 7 Dec 2009 15:31:17 +0000 (16:31 +0100)
committerBdale Garbee <bdale@gag.com>
Mon, 7 Dec 2009 15:31:17 +0000 (16:31 +0100)
1  2 
sudo.c

diff --cc sudo.c
Simple merge