Merge patch from ft for aptitude and sudo

No match.