Merge commit 'ronnie-ctdb/master' into tridge
authorroot <root@h01c001mz.VSOFS1.COM>
Thu, 8 May 2008 06:46:23 +0000 (16:46 +1000)
committerroot <root@h01c001mz.VSOFS1.COM>
Thu, 8 May 2008 06:46:23 +0000 (16:46 +1000)
(This used to be ctdb commit 2ef839c95a48cd8a5f0ed385e92bdb89de71b4a2)


Trivial merge