merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Fri, 8 Jun 2007 05:36:07 +0000 (15:36 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Fri, 8 Jun 2007 05:36:07 +0000 (15:36 +1000)
commitabab873c0fcaa32d699c38652fb85267a1f4d015
treeb84ddc77a5e14bb4bbac7663fa63dcedb36e099c
parentca88e271c075c032cb84a1396a0bea6793fc54af
parent4eda38ed21cdd71bd180206884dd6b3a65ae6469
merge from tridge

(This used to be ctdb commit f231a3a1f9e6214c64468e735b03fd7b12879be9)