Merge commit 'ctdb-ronnie/master'
authorMichael Adam <obnox@samba.org>
Wed, 4 Mar 2009 20:26:25 +0000 (21:26 +0100)
committerMichael Adam <obnox@samba.org>
Wed, 4 Mar 2009 20:26:25 +0000 (21:26 +0100)
commit36709e4325fe9a0f377e8e79741741ded4e7f7b0
treebd2472461183ed9922b4a48fd5e9d6bf6cf7ee92
parentf0e3cdde7bd35bb586a46c31609398b7d4b05a26
parentecf26af22245d0f55aded50e8768b0c21495f98c
Merge commit 'ctdb-ronnie/master'