[dnssec-tools/el6/master: 25/26] Merge branch 'master' of ssh://pkgs.fedoraproject.org/dnssec-tools

[Wes Hardaker]

commit 7b5cb9e2205041ec8cb965f2a1d81626414bd8f0
Merge: 37e028d f5195a3
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Thu Mar 24 15:13:59 2011 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/dnssec-tools
    
    Conflicts:
    	dnssec-tools.spec

 dnssec-tools.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc dnssec-tools.spec
index 9d58ce9,0fbf03c..6353c27
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@@ -303,9 -301,9 +303,12 @@@ rm -rf %{buildroot
  %{_mandir}/man3/val_freeaddrinfo.3.gz
  
  %changelog
 +* Thu Mar 24 2011 Wes Hardaker <wjhns174 at hardakers.net> - 1.9-1
 +- Upgrade to 1.9 from upstream
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue Oct 26 2010 Wes Hardaker <wjhns174 at hardakers.net> - 1.8-4
  - Require getop