merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Thu, 19 Apr 2007 21:19:07 +0000 (07:19 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Thu, 19 Apr 2007 21:19:07 +0000 (07:19 +1000)
commit4ffc63aa2b907cd861375326aafcecd99af9a5ec
tree99c058fb6b752e6f02cafbbc411d28787ffc9334
parentba162178b970a85bd91a0bdebaf26c22ed5b6759
parentdb12f3359b9fb666381385b3984a7bed72f37b3a
merge from tridge

(This used to be ctdb commit 819cdf314900388fe36368a21e2c4895b78b9203)