patch by not_erik 2xr=justdave a=justdave for 2.17.1 git-svn-id: svn://10.0.0.236/trunk@132942 18797224-902f-48f8-a5cc-f745e15eee43
patch by not_erik 2xr=justdave a=justdave for 2.17.1 git-svn-id: svn://10.0.0.236/trunk@132942 18797224-902f-48f8-a5cc-f745e15eee43