Merge from trunk

diff --cc .bzrignore
index b09242c507011370775e630b0ffa3ed1ad5836c9,6d7b914952be9059ade749b53266fbae9be76d47..4bad7a94e2fc24138ddda3aaeb18ec641bf3c715
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -15,48 -12,20 +15,58 @@@ tm
  .dirstamp
  *.la
  *.lo
 +*.loT
+ */globals.cc
  Makefile.in
 +aclocal.m4
 +install-sh
 +missing
  configure
 +depcomp
 +lib/libLtdl
 +lib/**/config.h
 +Makefile
 +*/Makefile
 +*/*/*/Makefile
 +scr/**/Makefile
 +lib/**/Makefile
 +helpers/basic_auth/**/Makefile
 +helpers/digest_auth/**/Makefile
 +helpers/external_acl/**/Makefile
 +helpers/ntlm_auth/**/Makefile
 +helpers/negotiate_auth/Makefile
 +doc/*.8
 +helpers/**/*_auth
 +helpers/external_acl/ip_user/ip_user_check
 +helpers/external_acl/session/squid_session
 +helpers/external_acl/unix_group/squid_unix_group
 +include/autoconf.h
 +include/stamp-h1
 +scripts/RunAccel
 +scripts/RunCache
 +src/cf.data
 +src/cf_gen
 +src/cf_gen_defines.h
 +src/cf_parser.h
 +src/globals.cc
 +src/repl_modules.cc
 +src/squid
 +src/squid.conf.default
 +src/string_arrays.c
 +src/ufsdump
 +src/unlinkd
 +src/DiskIO/DiskDaemon/diskd
 +tools/cachemgr.cgi
 +tools/squidclient
  config.h.in
 -cfgaux
  stamp-h.in
 -aclocal.m4
  autoconf.h.in
+ testHeaders
+ doc/Programming-Guide/html
+ helpers/*/Makefile
+ helpers/*/*/Makefile
+ scripts/Makefile
+ snmplib/Makefile
+ src/*/Makefile
+ test-suite/Makefile
+ tools/Makefile

diff --cc configure.in
Simple merge