merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Tue, 10 Jul 2007 07:45:04 +0000 (17:45 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Tue, 10 Jul 2007 07:45:04 +0000 (17:45 +1000)
commit2b68a5293a9c57dfc6fa4ab6ceb14190f7e2f32e
tree02e18506e25b49149328fcdc73b0a0371c5018da
parented1a52b29301bb2fdff4498f6eb38b4a1e49d7e0
parenta4c96397f59232219ddc1c79333093c2fcbbd2ef
merge from tridge

(This used to be ctdb commit 6aecb65883eb902375f85b70a1512db4339833eb)