merge from 4.2 patches to main line


git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@6011 06827809-a52a-0410-b366-d66718629ded
81 files changed