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

[Wes Hardaker]

commit a8153827d26600d5560b1317837a356d078713b5
Merge: 573647d 18956b5
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Mon Oct 31 13:44:57 2011 -0700

    Merge branch 'master' into el6

 .gitignore                               |    1 +
 dnssec-tools-linux-conf-paths-1.11.patch |   35 ++++++++++++++++++++++++++++++
 dnssec-tools.spec                        |   18 ++++++++++++--
 sources                                  |    2 +-
 4 files changed, 52 insertions(+), 4 deletions(-)
---