[dnssec-tools/el5: 13/13] Merge branch 'master' into el5

[Wes Hardaker]

commit 636ad3c5bd9cd9fb275314fb132866e78fb30b70
Merge: 0dae4f4 c94def9
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Thu Jun 21 15:24:03 2012 -0700

    Merge branch 'master' into el5

 .gitignore                               |    3 +
 dnssec-tools-fix-tcp-read-1.12.patch     |   13 +++++
 dnssec-tools-linux-conf-paths-1.13.patch |   35 ++++++++++++++
 dnssec-tools.spec                        |   76 ++++++++++++++++++++++--------
 sources                                  |    2 +-
 5 files changed, 108 insertions(+), 21 deletions(-)
---