Merge commit 'rusty/libctdb-new' into foo

author Ronnie Sahlberg <ronniesahlberg@gmail.com>

Tue, 17 Aug 2010 23:53:52 +0000 (09:53 +1000)

committer Ronnie Sahlberg <ronniesahlberg@gmail.com>

Tue, 17 Aug 2010 23:53:52 +0000 (09:53 +1000)
author Ronnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 17 Aug 2010 23:53:52 +0000 (09:53 +1000)
committer Ronnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 17 Aug 2010 23:53:52 +0000 (09:53 +1000)
diff --cc Makefile.in
Simple merge
diff --cc include/ctdb.h
Simple merge
diff --cc tools/ctdb.c
Simple merge
author	Ronnie Sahlberg <ronniesahlberg@gmail.com>
	Tue, 17 Aug 2010 23:53:52 +0000 (09:53 +1000)
committer	Ronnie Sahlberg <ronniesahlberg@gmail.com>
	Tue, 17 Aug 2010 23:53:52 +0000 (09:53 +1000)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
include/ctdb.h	patch \|	diff1 \|	diff2 \|	blob \| history
tools/ctdb.c	patch \|	diff1 \|	diff2 \|	blob \| history