Merge commit 'ctdb-ronnie/master'
authorMichael Adam <obnox@samba.org>
Mon, 23 Mar 2009 09:07:44 +0000 (10:07 +0100)
committerMichael Adam <obnox@samba.org>
Mon, 23 Mar 2009 09:07:44 +0000 (10:07 +0100)
1  2 
config/ctdb.sysconfig
include/ctdb_private.h

Simple merge
Simple merge