Merged from trunk

diff --cc src/Makefile.am
Simple merge

diff --cc src/client_side.cc
Simple merge

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

diff --cc src/protos.h
Simple merge

diff --cc src/structs.h
Simple merge

diff --cc src/typedefs.h
index aa6bc49149d8c9144a4cd9255485e191e852adde,73f960e26815f322fd31f372becc42af15dd4240..6b539ffcf20a16be6badab684023b39027d4e907
--- 1/src/typedefs.h
--- 2/src/typedefs.h
+++ b/src/typedefs.h
@@@ -56,10 -56,10 +56,8 @@@ typedef struct _dread_ctrl dread_ctrl
  
  typedef struct _dwrite_q dwrite_q;
  
- typedef struct _fileMap fileMap;
- 
  typedef struct _HttpHeaderFieldAttrs HttpHeaderFieldAttrs;
  
 -typedef struct _HttpHeaderStat HttpHeaderStat;
 -
  typedef struct _domain_ping domain_ping;
  
  typedef struct _domain_type domain_type;