Merged from trunk

diff --cc src/Makefile.am
Simple merge

diff --cc src/sbuf/Makefile.am
index d7e914dd0eca61c602c9c12758aa05b8216cb046,e42c1e29b7f1e60e5526e2efb41c49410c4437cf..b2d1392c283b80afa1c482631174cb479e9ac610
--- 1/src/sbuf/Makefile.am
--- 2/src/sbuf/Makefile.am
+++ b/src/sbuf/Makefile.am
@@@ -16,12 -16,14 +16,14 @@@ libsbuf_la_SOURCES = 
        OutOfBoundsException.h \
        SBuf.cc \
        SBuf.h \
 -      SBufAlgos.cc \
 -      SBufAlgos.h \
 -      SBufDetailedStats.cc \
 -      SBufDetailedStats.h \
 -      SBufExceptions.cc \
 -      SBufExceptions.h \
 +      Algorithms.cc \
 +      Algorithms.h \
 +      DetailedStats.cc \
 +      DetailedStats.h \
 +      Exceptions.cc \
 +      Exceptions.h \
        SBufList.cc \
        SBufList.h \
-       SBufStream.h
+       SBufStream.h \
+       Stats.cc \
+       Stats.h

diff --cc src/sbuf/SBuf.cc
Simple merge

diff --cc src/sbuf/SBuf.h
index 0266e396dac5007dc682466fcb25c7207b26b7c5,b0aa872d2898e08b0b7c099364724ffbba8a7d31..b9733dc03341c94d79ff1f3abd7aaad9aa7a54e6
--- 1/src/sbuf/SBuf.h
--- 2/src/sbuf/SBuf.h
+++ b/src/sbuf/SBuf.h
@@@ -15,7 -15,8 +15,8 @@@
  #include "Debug.h"
  #include "globals.h"
  #include "sbuf/MemBlob.h"
 -#include "SBufExceptions.h"
+ #include "sbuf/Stats.h"
 +#include "sbuf/Exceptions.h"
  
  #include <climits>
  #include <cstdarg>