[dnssec-tools/f19: 10/10] Merge branch 'master' into f19

[Wes Hardaker]

commit f1e63a43d91f1106774e43ca44596e63aed20e98
Merge: 847b115 0d6d084
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Wed Jan 22 10:26:09 2014 -0800

    Merge branch 'master' into f19
    
    Conflicts:
    	dnssec-tools.spec

 dnssec-tools-zonefile-fast-nsec3-fixes.patch |   40 ++++++++++++++++++++++++++
 dnssec-tools.spec                            |   13 ++++++++-
 sources                                      |    2 +-
 3 files changed, 53 insertions(+), 2 deletions(-)
---