merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Tue, 8 Jan 2008 23:10:33 +0000 (10:10 +1100)
committerRonnie Sahlberg <sahlberg@ronnie>
Tue, 8 Jan 2008 23:10:33 +0000 (10:10 +1100)
commit9862338dd29d4c9ac7d4acdf2604cae34fca97ef
tree1eb182b9e7843293bd906201dc790d981ecba19b
parentfd227f5d295309b241ffb23606245709636662fc
parentfa77de5b342cc438fefac22a565de3d97410eba8
merge from tridge

(This used to be ctdb commit 3e40441fbd0b2924def97b04b738f9c186c71c14)