Merge branch 'testing' into unstable

Conflicts:
	configure.ac

diff --cc builddebs.sh
Simple merge

diff --cc src/config.cc
Simple merge

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

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

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