http patch from darin, r=me, sr=rpotts. psm patch from me, r=javi, sr=rpotts. git-svn-id: svn://10.0.0.236/trunk@93425 18797224-902f-48f8-a5cc-f745e15eee43
http patch from darin, r=me, sr=rpotts. psm patch from me, r=javi, sr=rpotts. git-svn-id: svn://10.0.0.236/trunk@93425 18797224-902f-48f8-a5cc-f745e15eee43