Merge from trunk

diff --cc lib/Makefile.am
Simple merge

diff --cc src/Makefile.am
index c92cbc3a1b47f3d8418f6500258eb3b5b7699377,3c463b31a8e09b6db0d6becfc8f14a67d74d92ed..be95f6f47e9e9131f205c66811f271a13e504a22
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1189,9 -1179,10 +1189,9 @@@ check_PROGRAMS+= testHeaders 
  
  ## Special Universal .h dependency test script
  ## aborts if error encountered
 -testHeaders: *.h DiskIO/*.h ICAP/*.h
 +testHeaders: *.h DiskIO/*.h
-       ../test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1
-       ../test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO" || exit 1
 -      $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "ICAP" || exit 1
  ## src/repl/ has no .h files and its own makefile.
  
  

diff --cc src/cf.data.pre
Simple merge