patch by malcolm-bmo@farside.org.uk r=neil@parkwaycc.co.uk sr=alecf a=asa git-svn-id: svn://10.0.0.236/trunk@149607 18797224-902f-48f8-a5cc-f745e15eee43
patch by malcolm-bmo@farside.org.uk r=neil@parkwaycc.co.uk sr=alecf a=asa git-svn-id: svn://10.0.0.236/trunk@149607 18797224-902f-48f8-a5cc-f745e15eee43