merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Sat, 9 Jun 2007 22:53:44 +0000 (08:53 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Sat, 9 Jun 2007 22:53:44 +0000 (08:53 +1000)
commit1f6a5b9ea4db7d1bce988357e021cd80afc3b3c7
tree713520651ed56d260af83aa21435115fa48d60db
parent9c8049054d29f7c6b36cc7f044d147ee3478eb82
parent044a2e04c43a05e559500010560ea8a4d533fb97
merge from tridge

(This used to be ctdb commit 171f50bd5c87a71316a3efd346f7fd7496de9914)