[dnssec-tools/el5: 28/28] manual merge

[Wes Hardaker]

commit 62738b49f166f0f93e5857a7bf264b139b1811ad
Merge: 3bc7495 4a8e830
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Fri Jan 27 15:37:36 2012 -0800

    manual merge

 .gitignore                                        |    3 +
 dnssec-tools-1.11-fix-null-dereference.patch      |   15 +++++++
 dnssec-tools-linux-conf-paths-1.11.patch          |   35 ++++++++++++++++
 dnssec-tools-linux-conf-paths-1.12.patch          |   35 ++++++++++++++++
 dnssec-tools-perl-validator-header-fix-1.12.patch |   11 +++++
 dnssec-tools.spec                                 |   45 +++++++++++++++++---
 sources                                           |    2 +-
 7 files changed, 138 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index 235b9d3,cdf1029..2853dd6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,5 +1,6 @@@
 +/dnssec-tools-1.7.tar.gz
  /dnssec-tools-1.8.tar.gz
  /dnssec-tools-1.9.tar.gz
+ /dnssec-tools-1.10.tar.gz
+ /dnssec-tools-1.11.tar.gz
+ /dnssec-tools-1.12.tar.gz