On windows-sspi branch: Merged changes from trunk.
On windows-sspi branch: Merged changes from trunk.


git-svn-id: 87533aee4e1e283f2f8edd7b3d79b516f1ab5232@1334 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845

coapp-packages/serf,coapp-packages/serf,coapp-packages/serf