resolve some conflicts from merging from martins branch
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 26 Nov 2009 02:42:12 +0000 (13:42 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 26 Nov 2009 02:42:12 +0000 (13:42 +1100)
commited4f3ea3ccf365afc3475acad9549d92a8e04fed
treedad154a3e269583116eaed688e2e70da0636f8da
parent8029db6a9141f306b2621bdad76915062f2e115f
resolve some conflicts from merging from martins branch

(This used to be ctdb commit d3e7407dc9854ec358d081777c5450ec68b17862)
ctdb/server/eventscript.c