Merge from trunk

diff --cc configure.in
Simple merge

diff --cc src/helper.cc
index d8269a79c3f63c44f681f5f64bb50083e6857467,101f869409b6242fe3a39c35501a0fe51b23c931..b06ccf9ed232071379f0b05a62615766e91ad676
--- 1/src/helper.cc
--- 2/src/helper.cc
+++ b/src/helper.cc
@@@ -648,8 -644,7 +649,8 @@@ helperStatefulStats(StoreEntry * sentry
      storeAppendPrintf(sentry, "\nFlags key:\n\n");
      storeAppendPrintf(sentry, "   B = BUSY\n");
      storeAppendPrintf(sentry, "   C = CLOSING\n");
 -    storeAppendPrintf(sentry, "   R = RESERVED or DEFERRED\n");
 +    storeAppendPrintf(sentry, "   R = RESERVED\n");
-     storeAppendPrintf(sentry, "   R = DEFERRED\n");
++    storeAppendPrintf(sentry, "   D = DEFERRED\n");
      storeAppendPrintf(sentry, "   S = SHUTDOWN PENDING\n");
      storeAppendPrintf(sentry, "   P = PLACEHOLDER\n");
  }

diff --cc src/main.cc
index 698977fea7269e57d7874273779f64c153c9b4b9,00bb217c56f6ba5f6d0db5782691723d24a8ba31..6c02cbb212e8fcd9ed04580ea1a895d634463317
--- 1/src/main.cc
--- 2/src/main.cc
+++ b/src/main.cc
@@@ -781,9 -799,23 +790,12 @@@ mainRotate(void
      accessLogRotate();                /* access.log */
      useragentRotateLog();     /* useragent.log */
      refererRotateLog();               /* referer.log */
+ #if ICAP_CLIENT
+     icapLogRotate();               /*icap.log*/
+ #endif
  #if WIP_FWD_LOG
 -
      fwdLogRotate();
  #endif
 -
 -    icmpEngine.Open();
 -#if USE_DNSSERVERS
 -
 -    dnsInit();
 -#endif
 -
 -    redirectInit();
 -    authenticateInit(&Config.authConfiguration);
 -    externalAclInit();
  }
  
  static void