Merge commit 'ronnie-ctdb/master' into tridge tridge/ronnie
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)
commit2ef839c95a48cd8a5f0ed385e92bdb89de71b4a2
tree2d145a9ef2fba1292e543271ce74bba776e18016
parentbadf34692449bf658cef488c0da6c3eb90187555
parent9e08ab6c9f54f5a2c5790927e9aff107ca85a2cc
Merge commit 'ronnie-ctdb/master' into tridge