Merge remote-tracking branch 'gh/wip-2349'

author Sage Weil <sage@newdream.net>

Wed, 30 May 2012 17:05:01 +0000 (10:05 -0700)

committer Sage Weil <sage@newdream.net>

Wed, 30 May 2012 17:05:01 +0000 (10:05 -0700)
author Sage Weil <sage@newdream.net>
Wed, 30 May 2012 17:05:01 +0000 (10:05 -0700)
committer Sage Weil <sage@newdream.net>
Wed, 30 May 2012 17:05:01 +0000 (10:05 -0700)
diff --cc src/common/ceph_argparse.cc
Simple merge
diff --cc src/rados.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 30 May 2012 17:05:01 +0000 (10:05 -0700)
committer	Sage Weil <sage@newdream.net>
	Wed, 30 May 2012 17:05:01 +0000 (10:05 -0700)
		1	2
src/common/ceph_argparse.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history