merged tridge's branch

author Peter Somogyi <psomogyi@gamax.hu>

Thu, 26 Apr 2007 13:00:24 +0000 (15:00 +0200)

committer Peter Somogyi <psomogyi@gamax.hu>

Thu, 26 Apr 2007 13:00:24 +0000 (15:00 +0200)
author Peter Somogyi <psomogyi@gamax.hu>
Thu, 26 Apr 2007 13:00:24 +0000 (15:00 +0200)
committer Peter Somogyi <psomogyi@gamax.hu>
Thu, 26 Apr 2007 13:00:24 +0000 (15:00 +0200)
diff --cc common/ctdb.c
Simple merge
diff --cc common/ctdb_daemon.c
Simple merge
diff --cc include/ctdb.h
Simple merge
diff --cc include/ctdb_private.h
Simple merge
author	Peter Somogyi <psomogyi@gamax.hu>
	Thu, 26 Apr 2007 13:00:24 +0000 (15:00 +0200)
committer	Peter Somogyi <psomogyi@gamax.hu>
	Thu, 26 Apr 2007 13:00:24 +0000 (15:00 +0200)
		1	2
common/ctdb.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/ctdb_daemon.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/ctdb.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/ctdb_private.h	patch \|	diff1 \|	diff2 \|	blob \| history