Merge from trunk

diff --cc src/CompositePoolNode.h
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/cf_gen.cc
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side_reply.h
Simple merge

diff --cc src/errorpage.h
index 9e668c5fa09d2717b37fdf19dfb044ca31fedef2,c02d8f1ff6dca11047a2b8a6490c68995c7edeae..bc68ac7cf45233dbc5e8f639fa07d3157cc3708c
--- 1/src/errorpage.h
--- 2/src/errorpage.h
+++ b/src/errorpage.h
@@@ -35,9 -35,8 +35,9 @@@
  #define   SQUID_ERRORPAGE_H
  
  #include "squid.h"
 +#include "auth/UserRequest.h"
  #include "cbdata.h"
- #include "ip/IpAddress.h"
+ #include "ip/Address.h"
  
  /**
   \defgroup ErrorPageAPI Error Pages API

diff --cc src/protos.h
Simple merge