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)
commit69bdb333317d8954468adcf4a242dbf6129138fa
tree326e809190467effb56daa38fdd94ebfe8cb1597
parent8e8e428c7b3b055a12d24697761e653d0220524f
parentd00c54932a8fb95bd565ecd00bd3bf5201937611
Merge commit 'ronnie-ctdb/master' into tridge

(This used to be ctdb commit 2ef839c95a48cd8a5f0ed385e92bdb89de71b4a2)