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)
commite1c90b12290c682c2cba90e9afa3a09be014e20e
treef237798838ab30f34a2b8beeffebb0694f91e559
parent2f42429f6996e98c9bfad49eab9fa23e85d7bec2
parent59a04a50e64aae0a89b165d0428e23a8bcf8eb24
Merge commit 'ctdb-ronnie/master'