Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Fri, 16 Oct 2009 05:36:48 +0000 (16:36 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 16 Oct 2009 05:36:48 +0000 (16:36 +1100)
commitb20d6800709caa6ec938d5124915fbd2f4faad0b
tree34a00dfa6516861d07ffc283e35a78972e867db4
parent0bff3b42898a037492f03adf5823af0dccc55039
parent53900b99ea6ac7fa083d0afddcadcc4f9c1d2467
Merge commit 'origin/master'

(This used to be ctdb commit 5ad283458e59ea8232e01f34be007901c10c8a2e)
ctdb/config/ctdb.init