Merged from trunk.

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/adaptation/icap/ModXact.cc
index c45b898da7917bf592041972c2d758c5383df0ec,6dbb850410731d6a8d2913543215437f5eff1fb8..7038f7c3d72856be76afc4dea310ef28fd92a6d5
--- 1/src/ICAP/ICAPModXact.cc
--- 2/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@@ -8,14 -8,14 +8,14 @@@
  #include "HttpRequest.h"
  #include "HttpReply.h"
  #include "adaptation/Initiator.h"
- #include "ICAPServiceRep.h"
- #include "ICAPLauncher.h"
- #include "ICAPModXact.h"
- #include "ICAPClient.h"
+ #include "adaptation/icap/ServiceRep.h"
+ #include "adaptation/icap/Launcher.h"
+ #include "adaptation/icap/ModXact.h"
+ #include "adaptation/icap/Client.h"
  #include "ChunkedCodingParser.h"
  #include "TextException.h"
 -#include "AuthUserRequest.h"
 +#include "auth/UserRequest.h"
- #include "ICAPConfig.h"
+ #include "adaptation/icap/Config.h"
  #include "SquidTime.h"
  
  // flow and terminology:

diff --cc src/cache_cf.cc
Simple merge