merge from tridges tree
authorRonnie Sahlberg <sahlberg@ronnie>
Sat, 21 Apr 2007 07:57:50 +0000 (17:57 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Sat, 21 Apr 2007 07:57:50 +0000 (17:57 +1000)
commit540e862afc59fbe7ce0ea1f4b19b9897f790751c
tree6842ebf3ee884808eb6354703475abff2094782c
parent4ffc63aa2b907cd861375326aafcecd99af9a5ec
parent520f7971cd5b7ad2a4cf53012e139c26b682600d
merge from tridges tree

(This used to be ctdb commit d3fdb22eec5fd21132e2a9ab19ebbb21217ccec9)