Merge branch 'unstable' into msgr

author Greg Farnum <gregf@hq.newdream.net>

Thu, 3 Jun 2010 23:20:47 +0000 (16:20 -0700)

committer Greg Farnum <gregf@hq.newdream.net>

Thu, 3 Jun 2010 23:20:47 +0000 (16:20 -0700)
author Greg Farnum <gregf@hq.newdream.net>
Thu, 3 Jun 2010 23:20:47 +0000 (16:20 -0700)
committer Greg Farnum <gregf@hq.newdream.net>
Thu, 3 Jun 2010 23:20:47 +0000 (16:20 -0700)
diff --cc src/mds/MDCache.cc
Simple merge
diff --cc src/mds/MDS.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
diff --cc src/msg/SimpleMessenger.cc
Simple merge
author	Greg Farnum <gregf@hq.newdream.net>
	Thu, 3 Jun 2010 23:20:47 +0000 (16:20 -0700)
committer	Greg Farnum <gregf@hq.newdream.net>
	Thu, 3 Jun 2010 23:20:47 +0000 (16:20 -0700)
		1	2
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDS.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/msg/SimpleMessenger.cc	patch \|	diff1 \|	diff2 \|	blob \| history