Merge branch 'testing' into unstable

author Sage Weil <sage@newdream.net>

Thu, 26 Aug 2010 17:00:37 +0000 (10:00 -0700)

committer Sage Weil <sage@newdream.net>

Thu, 26 Aug 2010 17:00:37 +0000 (10:00 -0700)
author Sage Weil <sage@newdream.net>
Thu, 26 Aug 2010 17:00:37 +0000 (10:00 -0700)
committer Sage Weil <sage@newdream.net>
Thu, 26 Aug 2010 17:00:37 +0000 (10:00 -0700)
diff --cc src/Makefile.am
Simple merge
diff --cc src/cmon.cc
Simple merge
diff --cc src/msg/SimpleMessenger.cc
Simple merge
diff --cc src/os/FileJournal.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 26 Aug 2010 17:00:37 +0000 (10:00 -0700)
committer	Sage Weil <sage@newdream.net>
	Thu, 26 Aug 2010 17:00:37 +0000 (10:00 -0700)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/cmon.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/SimpleMessenger.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/FileJournal.cc	patch \|	diff1 \|	diff2 \|	blob \| history