patch by David Fraser <davidf@sjsoft.com>, r=bsmedberg, sr=mscott git-svn-id: svn://10.0.0.236/trunk@151834 18797224-902f-48f8-a5cc-f745e15eee43
patch by David Fraser <davidf@sjsoft.com>, r=bsmedberg, sr=mscott git-svn-id: svn://10.0.0.236/trunk@151834 18797224-902f-48f8-a5cc-f745e15eee43