Merge from trunk

diff --cc .bzrignore
index 45bd8c238e60e051a099ceac5bd6a50e59b3e0d7,4d12008e313799f01befd073af935eef209cb7b1..5fe2090e3992703c2c66c8abdd900b5b806458fd
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -14,46 -12,10 +14,47 @@@ tm
  .dirstamp
  *.la
  *.lo
 +*.loT
  Makefile.in
 +aclocal.m4
 +install-sh
 +missing
  configure
- include/autoconf.h.in
 +depcomp
 +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
 -cfgaux
+ config.h.in
 -aclocal.m4
+ stamp-h.in
+ autoconf.h.in