Merge git://git.samba.org/tridge/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 5 Aug 2008 23:17:41 +0000 (09:17 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 5 Aug 2008 23:17:41 +0000 (09:17 +1000)
commit45d9ada08591a32cedf30a6f7f3ed0f2f1d971f2
tree6a57da4b0952a792b9f05b833a83df6f7e9bf17b
parentbb154c8de6801a23e84088462c3c65d3b7e24103
parent78acc59784522f52fe75b9a6dd7784595035a93e
Merge git://git.samba.org/tridge/ctdb

(This used to be ctdb commit 14f2f719e6ddc266aafde4d4bf80ed3a01e145fe)