r=rrelyea, blocking-ff3=mconnor Also includes merged fix for: Bug 405145, Mixed SSL/non-SSL content reporting inconsistent between standard and EV Certs Patch contributed by Bill Gianopoulos r=kengert, a=dsicore git-svn-id: svn://10.0.0.236/trunk@240355 18797224-902f-48f8-a5cc-f745e15eee43