r=neil.parkwaycc.co.uk@myrealbox.com, sr=alecf@flett.org (for XPFE changes), src=mscott@mozilla.org (for MailNews changes) git-svn-id: svn://10.0.0.236/trunk@157688 18797224-902f-48f8-a5cc-f745e15eee43
r=neil.parkwaycc.co.uk@myrealbox.com, sr=alecf@flett.org (for XPFE changes), src=mscott@mozilla.org (for MailNews changes) git-svn-id: svn://10.0.0.236/trunk@157688 18797224-902f-48f8-a5cc-f745e15eee43