Merge branch 'master' into wip-scrub

author Sage Weil <sage@inktank.com>

Wed, 16 Jan 2013 21:17:41 +0000 (13:17 -0800)

committer Sage Weil <sage@inktank.com>

Wed, 16 Jan 2013 21:17:41 +0000 (13:17 -0800)
author Sage Weil <sage@inktank.com>
Wed, 16 Jan 2013 21:17:41 +0000 (13:17 -0800)
committer Sage Weil <sage@inktank.com>
Wed, 16 Jan 2013 21:17:41 +0000 (13:17 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Wed, 16 Jan 2013 21:17:41 +0000 (13:17 -0800)
committer	Sage Weil <sage@inktank.com>
	Wed, 16 Jan 2013 21:17:41 +0000 (13:17 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history