Merged from trunk

diff --cc src/ClientInfo.h
index 4bd5962a999d31a58a54ff58cd4bac83dbd7bb1a,c84f7d3f78a1ab45673efbd51de1f0071e4e68ca..07f4195fb3d552a81f1c93500b4112014cadd03b
--- 1/src/ClientInfo.h
--- 2/src/ClientInfo.h
+++ b/src/ClientInfo.h
@@@ -14,7 -15,8 +15,8 @@@
  #include "hash.h"
  #include "ip/Address.h"
  #include "LogTags.h"
 -#include "typedefs.h"
 +#include "typedefs.h" //for kb_t
+ 
  #include <deque>
  
  #if USE_DELAY_POOLS

diff --cc src/fs/ufs/UFSSwapDir.cc
Simple merge

diff --cc src/tools.h
Simple merge

diff --cc src/typedefs.h
index da6604410bf5b49f8b7849c93201e29d31d621a5,0022fbe06d5640473fa4f4e9f3878fd878c2b34b..7c0a193c980db4c6db9a36e48d317e18a1ef934d
--- 1/src/typedefs.h
--- 2/src/typedefs.h
+++ b/src/typedefs.h
@@@ -6,15 -6,27 +6,10 @@@
   * Please see the COPYING and CONTRIBUTORS files for details.
   */
  
--#include "enums.h"
--
  #ifndef SQUID_TYPEDEFS_H
  #define SQUID_TYPEDEFS_H
  
- typedef struct {
-     size_t bytes;
-     size_t kb;
- } kb_t;
 -typedef int32_t sfileno;
 -typedef signed int sdirno;
 -
 -typedef uint32_t nfmark_t;
 -typedef unsigned char tos_t;
 -
 -typedef struct _CommWriteStateData CommWriteStateData;
 -
 -#if SQUID_SNMP
 -#include "cache_snmp.h"
 -typedef variable_list *(oid_ParseFn) (variable_list *, snint *);
 -#endif
 -
 -typedef void FREE(void *);
 -typedef void FOCB(void *, int fd, int errcode);
 -typedef void PF(int, void *);
++#include "enums.h"
  
  /* disk.c / diskd.c callback typedefs */
  typedef void DRCB(int, const char *buf, int size, int errflag, void *data);