Merge branch 'stable' into next

author Sage Weil <sage@newdream.net>

Wed, 1 Jun 2011 23:28:17 +0000 (16:28 -0700)

committer Sage Weil <sage@newdream.net>

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