patch by walk84@yahoo.com r=sfraser sr=bryner git-svn-id: svn://10.0.0.236/trunk@131521 18797224-902f-48f8-a5cc-f745e15eee43