Merge remote branch 'origin/testing' into unstable

author Sage Weil <sage@newdream.net>

Tue, 5 Oct 2010 23:47:37 +0000 (16:47 -0700)

committer Sage Weil <sage@newdream.net>

Tue, 5 Oct 2010 23:47:37 +0000 (16:47 -0700)
author Sage Weil <sage@newdream.net>
Tue, 5 Oct 2010 23:47:37 +0000 (16:47 -0700)
committer Sage Weil <sage@newdream.net>
Tue, 5 Oct 2010 23:47:37 +0000 (16:47 -0700)
diff --cc src/config.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 5 Oct 2010 23:47:37 +0000 (16:47 -0700)
committer	Sage Weil <sage@newdream.net>
	Tue, 5 Oct 2010 23:47:37 +0000 (16:47 -0700)
		1	2
src/config.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history