patch by Jonathan Watt <jonathan.watt@strath.ac.uk>, r=alex git-svn-id: svn://10.0.0.236/trunk@166932 18797224-902f-48f8-a5cc-f745e15eee43
patch by Jonathan Watt <jonathan.watt@strath.ac.uk>, r=alex git-svn-id: svn://10.0.0.236/trunk@166932 18797224-902f-48f8-a5cc-f745e15eee43