Merge remote branch 'origin/testing' into unstable

Conflicts:
	configure.ac
	src/rados.cc

diff --cc configure.ac
index 4fe1e330fe2c1adaac241aef7c8eb841f92f359d,3ec1d776bf8cc0213ecb575e168c9709c4350426..d8f857c41d5bc8aaecbba7cf332fb69bab1c7077
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3,7 -3,7 +3,7 @@@
  
  # Autoconf
  AC_PREREQ(2.59)
- AC_INIT([Ceph distributed file system], [.1], 
 -AC_INIT([Ceph distributed file system], [0.22.1], 
++AC_INIT([Ceph distributed file system], [0.23~rc], 
              [Sage Weil <sage@newdream.net>],
              [ceph])
  

diff --cc src/Makefile.am
Simple merge

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

diff --cc src/os/FileStore.cc
Simple merge