[fetch-crl/el6/master: 15/15] Merge branch 'master' into el6

[stevetraylen]

commit b7f25b1cea4baa5337fc504b5cda6d0ad13e76ad
Merge: 4987cb5 4bf1a51
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Aug 16 22:12:30 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    
    	.gitignore
    	fetch-crl.spec
    	sources

 .gitignore     |    2 +-
 fetch-crl.spec |   49 +++++++++++++++++++++++++++++++++++++++----------
 sources        |    2 +-
 3 files changed, 41 insertions(+), 12 deletions(-)
---
diff --cc fetch-crl.spec
index 8ad8419,9384f53..1fbc0df
--- a/fetch-crl.spec
+++ b/fetch-crl.spec
@@@ -54,8 -70,6 +70,11 @@@ install -p -m 644 $RPM_BUILD_ROOT%{_usr
  rm $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/%{name}-boot.init
  rm $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/%{name}-cron.cron
  rm $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/%{name}-cron.init
++<<<<<<< HEAD:fetch-crl.spec
 +rm $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/%{name}.cron
 +rm $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/%{name}.sysconfig
++=======
++>>>>>>> master:fetch-crl.spec
  
  
  %post