Merged from trunk

diff --cc src/AuthReg.h
Simple merge

diff --cc src/SquidIpc.h
index 7abfeefe9ea69f1eb9d66eddef7821a648f68f3c,30fcd344a00ec0a6e1cbb967a2131c6559aebcdf..61396d16e61ff84314c3a7bb277443ee3e860cab
--- 1/src/SquidIpc.h
--- 2/src/SquidIpc.h
+++ b/src/SquidIpc.h
@@@ -32,16 -32,17 +32,17 @@@
   *
   */
  
- namespace Ip {
-   class Address;
+ namespace Ip
+ {
+ class Address;
  }
 -extern pid_t ipcCreate(int type,
 -                       const char *prog,
 -                       const char *const args[],
 -                       const char *name,
 -                       Ip::Address &local_addr,
 -                       int *rfd,
 -                       int *wfd,
 -                       void **hIpc);
 +pid_t ipcCreate(int type,
-                              const char *prog,
-                              const char *const args[],
-                              const char *name,
-                              Ip::Address &local_addr,
-                              int *rfd,
-                              int *wfd,
-                              void **hIpc);
++                const char *prog,
++                const char *const args[],
++                const char *name,
++                Ip::Address &local_addr,
++                int *rfd,
++                int *wfd,
++                void **hIpc);
  
  #endif /* SQUID_SQUIDIPC_H_ */

diff --cc src/SquidList.h
Simple merge

diff --cc src/SquidString.h
Simple merge

diff --cc src/WinSvc.h
Simple merge

diff --cc src/snmp_core.h
Simple merge

diff --cc src/win32.h
Simple merge