patch by neil@parkwaycc.co.uk r=akkana sr=bz git-svn-id: svn://10.0.0.236/trunk@135124 18797224-902f-48f8-a5cc-f745e15eee43