Merge from trunk

diff --cc configure.in
Simple merge

diff --cc lib/Makefile.am
Simple merge

diff --cc libsquid-compat/GnuRegex.c
Simple merge

diff --cc libsquid-compat/GnuRegex.h
index 9bfb36d2cd9dba26e2e6fbcc2d03dd2518382634,65443fefbf50654ec4de61b535105e6d4b9ed707..286e4ff6fb2f31a33f57554a2baaad5b9f536f83
--- 1/libsquid-compat/GnuRegex.h
--- 2/include/GNUregex.h
+++ b/libsquid-compat/GnuRegex.h
@@@ -1,7 -1,6 +1,10 @@@
+ /*
+  * $Id$
+  */
 +#ifndef SQUID_CONFIG_H
 +#include "config.h"
 +#endif
 +
  #ifndef SQUID_REGEXP_LIBRARY_H
  #define SQUID_REGEXP_LIBRARY_H
  

diff --cc src/globals.h
Simple merge