From f05ae97ea17e835b4f9b198e4ebeb892f33aabd9 Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@novell.com>
Date: Mon, 6 Jun 2005 19:24:30 +0000
Subject: pull up missing merge from branch

2005-06-06  JP Rosevear  <jpr@novell.com>

	* lib/e-cert-db.c (install_loadable_roots): pull up missing merge
	from branch

svn path=/trunk/; revision=29462
---
 smime/ChangeLog | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'smime/ChangeLog')

diff --git a/smime/ChangeLog b/smime/ChangeLog
index d33b4a90a6..c5f9ce52ee 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,8 +1,19 @@
+2005-06-06  JP Rosevear  <jpr@novell.com>
+
+	* lib/e-cert-db.c (install_loadable_roots): pull up missing merge
+	from branch
+
 2005-05-06  Sankar P <psankar@novell.com>
 
 	*gui/certificate-manager.c
 	Changed cert to certificates
 	Fixes #273075
+	
+2005-03-31  Jeffrey Stedfast  <fejj@novell.com>
+
+	* lib/e-cert-db.c (install_loadable_roots): Copied Mozilla code to
+	check if the nssckbi root certs module was too old and if it was,
+	delete/unload it.
 
 2005-03-30  Li Yuan  <li.yuan@sun.com>
 
-- 
cgit v1.2.3