Merge branch 'wip-libcephfs-firefly-rb' of https://github.com/linuxbox2/linuxbox...

Reviewed-by: Sage Weil <sage@inktank.com>
This went through the fs suite and passed:

	http://pulpito.ceph.com/sage-2014-02-12_13:38:53-fs-wip-libcephfs-testing-basic-plana

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

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

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

diff --cc src/osdc/Objecter.h
Simple merge