merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Sat, 19 May 2007 00:12:37 +0000 (10:12 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Sat, 19 May 2007 00:12:37 +0000 (10:12 +1000)
commit99652bdb94159f57567f690488a42b893c48b90e
tree54bd4a2ed0b6924bd83caf5048e7e8f21debb23e
parent334a294481f2a074bc7f975c7a0ec42901af9934
parent28f2fc669b5697eb2e8fb01c8ab2514ecb9f1199
merge from tridge

(This used to be ctdb commit af1eb92c7bdc26457f55b21ca96a496f55ea300b)