Merge remote branch 'origin/dead-code'

author Sage Weil <sage@newdream.net>

Mon, 11 Apr 2011 23:30:10 +0000 (16:30 -0700)

committer Sage Weil <sage@newdream.net>

Mon, 11 Apr 2011 23:30:10 +0000 (16:30 -0700)
author Sage Weil <sage@newdream.net>
Mon, 11 Apr 2011 23:30:10 +0000 (16:30 -0700)
committer Sage Weil <sage@newdream.net>
Mon, 11 Apr 2011 23:30:10 +0000 (16:30 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 11 Apr 2011 23:30:10 +0000 (16:30 -0700)
committer	Sage Weil <sage@newdream.net>
	Mon, 11 Apr 2011 23:30:10 +0000 (16:30 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history