Merge git://git.samba.org/tridge/ctdb
authorRonnie Sahlberg <sahlberg@ronnie.(none)>
Thu, 7 Feb 2008 21:21:03 +0000 (08:21 +1100)
committerRonnie Sahlberg <sahlberg@ronnie.(none)>
Thu, 7 Feb 2008 21:21:03 +0000 (08:21 +1100)
commit60e2a45454ed60a73f789ea4c0351fa4117e6053
tree6932e61354202362de5fd5ab3707f8ee30911886
parent81232a9e29d610a25a379bc3f1e0ee6fc18da19b
parentfbba202f1a929fcf29203a89f5bdf92a0a60beef
Merge git://git.samba.org/tridge/ctdb

(This used to be ctdb commit a8762bf8ca1958985896f174ccafe09361092d09)