Merge branch 'nstring' into unstable

diff --cc src/config.cc
Simple merge

diff --cc src/mds/CDentry.cc
Simple merge

diff --cc src/mds/CDentry.h
Simple merge

diff --cc src/mds/CDir.cc
Simple merge

diff --cc src/mds/CDir.h
Simple merge

diff --cc src/mds/CInode.cc
Simple merge

diff --cc src/mds/CInode.h
Simple merge

diff --cc src/mds/MDCache.cc
Simple merge

diff --cc src/mds/mdstypes.h
index 3c1b7b6b00bb9006af50db80ebe7468ecc19c338,597d0779cced57891394f02f65b1d9e5953a096f..44d57b4027130d81be4273fbbd418eb18c58bbc0
--- 1/src/mds/mdstypes.h
--- 2/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@@ -18,9 -18,9 +18,10 @@@ using namespace std
  
  #include "include/frag.h"
  #include "include/xlist.h"
+ #include "include/nstring.h"
  
 -#define MDS_REF_SET    // define me for improved debug output, sanity checking
 +#define MDS_REF_SET      // define me for improved debug output, sanity checking
 +#define MDS_AUTHPIN_SET  // define me for debugging auth pin leaks
  //#define MDS_VERIFY_FRAGSTAT    // do do (slow) sanity checking on frags
  
  #define MDS_PORT_CACHE   0x200