Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@inktank.com>

Fri, 12 Jul 2013 17:16:27 +0000 (10:16 -0700)

committer Sage Weil <sage@inktank.com>

Fri, 12 Jul 2013 17:16:27 +0000 (10:16 -0700)
author Sage Weil <sage@inktank.com>
Fri, 12 Jul 2013 17:16:27 +0000 (10:16 -0700)
committer Sage Weil <sage@inktank.com>
Fri, 12 Jul 2013 17:16:27 +0000 (10:16 -0700)
diff --cc src/Makefile.am
Simple merge
diff --cc src/ceph.in
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 12 Jul 2013 17:16:27 +0000 (10:16 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 12 Jul 2013 17:16:27 +0000 (10:16 -0700)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph.in	patch \|	diff1 \|	diff2 \|	blob \| history