Merge commit 'ctdb-ronnie/master'
authorMichael Adam <obnox@samba.org>
Mon, 9 Feb 2009 23:28:08 +0000 (00:28 +0100)
committerMichael Adam <obnox@samba.org>
Mon, 9 Feb 2009 23:28:08 +0000 (00:28 +0100)
commitd6c5f6557236d341a6b7216532aed7f56a2c422e
treef2a0168ec3bced950baee1eba6be55cc5c6f9247
parentbab2e7674459ff80ae4889f22747c8d190988ffb
parentbe926a46405503451b87909f7a73f844d191de92
Merge commit 'ctdb-ronnie/master'

(This used to be ctdb commit e1c90b12290c682c2cba90e9afa3a09be014e20e)