Merge branch 'stable'

author Sage Weil <sage@newdream.net>

Wed, 23 May 2012 23:41:14 +0000 (16:41 -0700)

committer Sage Weil <sage@newdream.net>

Wed, 23 May 2012 23:41:14 +0000 (16:41 -0700)
author Sage Weil <sage@newdream.net>
Wed, 23 May 2012 23:41:14 +0000 (16:41 -0700)
committer Sage Weil <sage@newdream.net>
Wed, 23 May 2012 23:41:14 +0000 (16:41 -0700)
diff --cc ceph.spec.in
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 23 May 2012 23:41:14 +0000 (16:41 -0700)
committer	Sage Weil <sage@newdream.net>
	Wed, 23 May 2012 23:41:14 +0000 (16:41 -0700)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history