Description: Merge sun libprldap changes on to trunk
Fix Description: Pretty much the same as the fixes made for bugs 352519 352673 on the sun_merge_branch_20060523, this just merges those changes on to the trunk. One additional change is the removal of an unused variable.
git-svn-id: svn://10.0.0.236/trunk@213108 18797224-902f-48f8-a5cc-f745e15eee43
5490d18a0f