git-svn-id: svn://10.0.0.236/trunk@171578 18797224-902f-48f8-a5cc-f745e15eee43
r=me patch by Neil Deakin <enndeakin@sympatico.ca> git-svn-id: svn://10.0.0.236/trunk@165889 18797224-902f-48f8-a5cc-f745e15eee43