merge from tridge
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Wed, 11 Apr 2007 01:08:20 +0000 (11:08 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Wed, 11 Apr 2007 01:08:20 +0000 (11:08 +1000)
(This used to be ctdb commit a027d468f39fdd95a4bd03e26da90eb229b2a645)

1  2 
ctdb/include/ctdb.h
ctdb/include/ctdb_private.h

Simple merge
Simple merge