[dnssec-tools/el6: 3/3] Merge branch 'master' into el6

[Wes Hardaker]

commit 573647d7d1cf8525f127c469ac4e721ce28ebd17
Merge: ee66d7e cfd9595
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Mon Jul 4 07:10:07 2011 -0700

    Merge branch 'master' into el6

 .gitignore                                  |    1 +
 dnssec-tools-1.9-resolv.conf-fallback.patch |   14 --------------
 dnssec-tools.spec                           |    9 +++++----
 sources                                     |    2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)
---
diff --cc .gitignore
index 235b9d3,3584e7f..55f8fff
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,4 @@@
 +/dnssec-tools-1.7.tar.gz
  /dnssec-tools-1.8.tar.gz
  /dnssec-tools-1.9.tar.gz
+ /dnssec-tools-1.10.tar.gz