Merged from trunk

diff --cc include/List.h
Simple merge

diff --cc include/radix.h
Simple merge

diff --cc src/AccessLogEntry.h
index b42b1ca0fc26d9866a52da7a81dda0ec5f38b8de,8f5cdad685b895e66d12c87e32298b97f2337c3f..574d684895e6621d34b836b573581d488376fefb
--- 1/src/AccessLogEntry.h
--- 2/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@@ -116,8 -123,12 +116,10 @@@ public
  
          char *request;
          char *reply;
 -    }
 -
 -    headers;
 +    } headers;
  
+     // Why is this a sub-class and not a set of real "private:" fields?
+     // It looks like its duplicating HTTPRequestMethod anyway!
      class Private
      {
  

diff --cc src/AuthUser.cci
Simple merge

diff --cc src/PeerDigest.h
index 379d185f8b1ed725d298ae22a04b45f9608e8127,6bb7650f6b229d5b2e481ceb447d97c6e7d58cb6..edc6d330e4ee83ee05d67387966495dbd2608064
--- 1/src/PeerDigest.h
--- 2/src/PeerDigest.h
+++ b/src/PeerDigest.h
@@@ -102,11 -102,11 +102,10 @@@ public
  
      struct
      {
- 
-         unsigned int needed:1;        /* there were requests for this digest */
-         unsigned int usable:1;        /* can be used for lookups */
-         unsigned int requested:1;     /* in process of receiving [fresh] digest */
+         unsigned int needed:1;          /**< there were requests for this digest */
+         unsigned int usable:1;          /**< can be used for lookups */
+         unsigned int requested:1;       /**< in process of receiving [fresh] digest */
 -    }
 -    flags;
 +    } flags;
  
      struct
      {

diff --cc src/SwapDir.h
Simple merge

diff --cc src/access_log.cc
Simple merge

diff --cc src/acl_noncore.cc
Simple merge

diff --cc src/auth/digest/auth_digest.h
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/client_side_reply.cc
Simple merge

diff --cc src/debug.cc
Simple merge

diff --cc src/fs/coss/StoreFScoss.h
Simple merge

diff --cc src/fs/ufs/ufscommon.h
Simple merge

diff --cc src/structs.h
Simple merge

diff --cc src/tests/testEvent.cc
Simple merge

diff --cc src/tools.cc
Simple merge

diff --cc src/typedefs.h
index 57b7161be30af873f8cefb81d49f586efcbaeb7f,79cdb1ff698e3e4f9f6e0e0a1060fcdcc8d0726b..987208018af830133214e66d79d5ad28da0b2b06
--- 1/src/typedefs.h
--- 2/src/typedefs.h
+++ b/src/typedefs.h
@@@ -46,17 -46,14 +46,13 @@@ typedef struc
  {
      size_t bytes;
      size_t kb;
 -}
 -kb_t;
 +} kb_t;
  
- typedef struct _acl_time_data acl_time_data;
+ //UNUSED              typedef struct _acl_time_data acl_time_data;
+ //UNUSED              typedef struct _acl_name_list acl_name_list;
+ //UNUSED              typedef struct _acl_deny_info_list acl_deny_info_list;
+ //UNUSED              typedef class AuthUser auth_user_t;
  
- typedef struct _acl_name_list acl_name_list;
- 
- typedef struct _acl_deny_info_list acl_deny_info_list;
- 
- /// \ingroup AuthAPI
- /// \deprecated Use AuthUser instead.
- typedef class AuthUser auth_user_t;
  
  /// \ingroup AuthAPI
  /// \deprecated Use AuthUserHashPointer instead.

diff --cc tools/cachemgr.cc
Simple merge