Bug 643041 - Merge nsIX509Cert2 and nsIX509Cert3 into nsIX509Cert, and merge nsIX509CertDB2 into nsIX509CertDB. r=keeler

--HG--
extra : rebase_source : 5283c637e45dbee9f741d56cda54fdef1afce16e