merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Wed, 22 Aug 2007 09:28:03 +0000 (19:28 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Wed, 22 Aug 2007 09:28:03 +0000 (19:28 +1000)
commita4ede6da6f4a6e28152498c1455576a94a6c4cc8
tree6c9201526feba5f526755097722d6adb55f379c9
parent50c09b746508b68c3be84026b6304a9ae25f9345
parentd95476fa3855aef270f9954b5e5c746bcac6e370
merge from tridge

(This used to be ctdb commit 3e17a62e7d9f2867d6f697d5dc5cdddf9fdc3497)