patch by fantasai@escape.com r=mpt, r=alecf, rs=brendan, a=asa git-svn-id: svn://10.0.0.236/trunk@117568 18797224-902f-48f8-a5cc-f745e15eee43
patch by fantasai@escape.com r=mpt, r=alecf, rs=brendan, a=asa git-svn-id: svn://10.0.0.236/trunk@117568 18797224-902f-48f8-a5cc-f745e15eee43