Merge branch 'unstable' into rados

diff --cc src/TODO
Simple merge

diff --cc src/client/Client.cc
Simple merge

diff --cc src/client/Client.h
Simple merge

diff --cc src/include/ceph_fs.h
Simple merge

diff --cc src/kernel/mds_client.c
Simple merge

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

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge

diff --cc src/osdc/Journaler.cc
Simple merge