merge from tridge

author Ronnie Sahlberg <sahlberg@ronnie>

Wed, 16 May 2007 01:12:28 +0000 (11:12 +1000)

committer Ronnie Sahlberg <sahlberg@ronnie>

Wed, 16 May 2007 01:12:28 +0000 (11:12 +1000)
author Ronnie Sahlberg <sahlberg@ronnie>
Wed, 16 May 2007 01:12:28 +0000 (11:12 +1000)
committer Ronnie Sahlberg <sahlberg@ronnie>
Wed, 16 May 2007 01:12:28 +0000 (11:12 +1000)
diff --cc common/ctdb_recoverd.c
Simple merge
diff --cc include/ctdb.h
Simple merge
author	Ronnie Sahlberg <sahlberg@ronnie>
	Wed, 16 May 2007 01:12:28 +0000 (11:12 +1000)
committer	Ronnie Sahlberg <sahlberg@ronnie>
	Wed, 16 May 2007 01:12:28 +0000 (11:12 +1000)
		1	2
common/ctdb_recoverd.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/ctdb.h	patch \|	diff1 \|	diff2 \|	blob \| history