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

author Sage Weil <sage@inktank.com>

Sat, 16 Feb 2013 17:39:34 +0000 (09:39 -0800)

committer Sage Weil <sage@inktank.com>

Sat, 16 Feb 2013 17:39:34 +0000 (09:39 -0800)
author Sage Weil <sage@inktank.com>
Sat, 16 Feb 2013 17:39:34 +0000 (09:39 -0800)
committer Sage Weil <sage@inktank.com>
Sat, 16 Feb 2013 17:39:34 +0000 (09:39 -0800)
diff --cc ceph.spec.in
Simple merge
diff --cc src/Makefile.am
Simple merge
author	Sage Weil <sage@inktank.com>
	Sat, 16 Feb 2013 17:39:34 +0000 (09:39 -0800)
committer	Sage Weil <sage@inktank.com>
	Sat, 16 Feb 2013 17:39:34 +0000 (09:39 -0800)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history