Merge remote-tracking branch 'gh/giant'

Conflicts:
	src/osdc/Objecter.cc

diff --cc ceph.spec.in
Simple merge

diff --cc qa/workunits/cephtool/test.sh
Simple merge

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

diff --cc src/mon/MonCommands.h
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

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

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

diff --cc src/test/Makefile.am
Simple merge