Merge branch 'use-polarssl-md5' of github.com:cmouse/pdns into cmouse-use-polarssl-md5

Conflicts:
	pdns/Makefile.am

diff --cc pdns/Makefile.am
index 9028b8cbed17bd1f62f50bdab098b7836e4f419c,8988cba9166f27d05f1f0ca6397f34c79d35005c..c46d95df3b7587a03d9df8a63ab4a1d5eb3e3930
--- 1/pdns/Makefile.am
--- 2/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@@ -243,7 -243,7 +243,7 @@@ dnsdemog_SOURCES=dnsdemog.cc misc.cc un
  rec_control_SOURCES=rec_channel.cc rec_channel.hh rec_control.cc arguments.cc arguments.hh misc.cc qtype.cc \
        unix_utility.cc logger.cc statbag.cc
  
- testrunner_SOURCES=testrunner.cc test-misc_hh.cc test-nameserver_cc.cc test-dnsrecords_cc.cc test-base32_cc.cc \
 -testrunner_SOURCES=testrunner.cc test-misc_hh.cc test-nameserver_cc.cc test-dnsrecords_cc.cc test-md5_hh.cc \
++testrunner_SOURCES=testrunner.cc test-misc_hh.cc test-nameserver_cc.cc test-dnsrecords_cc.cc test-base32_cc.cc test-md5_hh.cc \
          nameserver.cc misc.cc \
        unix_utility.cc logger.cc statbag.cc arguments.cc qtype.cc dnspacket.cc \
        dnswriter.cc base64.cc base32.cc dnsrecords.cc dnslabeltext.cc dnsparser.cc \