Merge branch '606' of github.com:cyclops1982/pdns into cyclops1982-606

diff --cc pdns/Makefile.am
index ea20bfef6ecd694b804dcf821e23006c3d57fd86,9d188ab54996c241fd0969395a97902a7f759bbc..12c1b930c290cca5ef64075d3dc8b18d977654ff
--- 1/pdns/Makefile.am
--- 2/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@@ -108,10 -109,11 +108,11 @@@ pdnssec_SOURCES=pdnssec.cc dbdnsseckeep
        signingpipe.cc dnslabeltext.cc ednssubnet.cc cachecleaner.hh \
        aes/aescpp.h \
        aes/aescrypt.c aes/aes.h aes/aeskey.c aes/aes_modes.c aes/aesopt.h \
-       aes/aestab.c aes/aestab.h aes/brg_endian.h aes/brg_types.h aes/dns_random.cc json.cc
+       aes/aestab.c aes/aestab.h aes/brg_endian.h aes/brg_types.h aes/dns_random.cc json.cc \
+       serialtweaker.cc 
  
  
 -pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
 +pdnssec_LDFLAGS=@moduleobjects@ @modulelibs@ @DYNLINKFLAGS@ @LIBDL@ @THREADFLAGS@  $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) 
  pdnssec_LDADD= ext/polarssl-1.1.2/library/libpolarssl.a $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SERIALIZATION_LIBS) $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(MYSQL_lib)
  
  if BOTAN110

diff --cc pdns/pdnssec.cc
Simple merge