Merge remote branch 'gh/master' into wip-backfill

author Sage Weil <sage@newdream.net>

Fri, 13 Jan 2012 16:35:47 +0000 (08:35 -0800)

committer Sage Weil <sage@newdream.net>

Fri, 13 Jan 2012 16:35:47 +0000 (08:35 -0800)
author Sage Weil <sage@newdream.net>
Fri, 13 Jan 2012 16:35:47 +0000 (08:35 -0800)
committer Sage Weil <sage@newdream.net>
Fri, 13 Jan 2012 16:35:47 +0000 (08:35 -0800)
diff --cc src/Makefile.am
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 13 Jan 2012 16:35:47 +0000 (08:35 -0800)
committer	Sage Weil <sage@newdream.net>
	Fri, 13 Jan 2012 16:35:47 +0000 (08:35 -0800)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history