[certmonger: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/certmonger

[Nalin Dahyabhai]

commit c276b718ef682c771eb211ab1bcf586d1e8b2613
Merge: 2f56706 d7a3dce
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Thu Sep 30 17:36:57 2010 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/certmonger
    
    Conflicts:
    	certmonger.spec

 certmonger.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc certmonger.spec
index 79ef1be,8811f01..097203d
--- a/certmonger.spec
+++ b/certmonger.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:		certmonger
  Version:	0.30
--Release:	3%{?dist}
++Release:	4%{?dist}
  Summary:	Certificate status monitor and PKI enrollment client
  
  Group:		System Environment/Daemons
@@@ -104,10 -101,9 +104,13 @@@ exit 
  %{_localstatedir}/lib/certmonger
  
  %changelog
- * Thu Sep 30 2010 Nalin Dahyabhai <nalin at redhat.com> 0.30-3
++* Thu Sep 30 2010 Nalin Dahyabhai <nalin at redhat.com> 0.30-4
 +- explicitly require "dbus" to try to ensure we have a running system bus
 +  when we get started (#639126)
 +
+ * Wed Sep 29 2010 jkeating - 0.30-3
+ - Rebuilt for gcc bug 634757
+ 
  * Thu Sep 23 2010 Nalin Dahyabhai <nalin at redhat.com> 0.30-2
  - try to SIGHUP the messagebus daemon at first install so that it'll
    let us claim our service name if it isn't restarted before we are