Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Tue, 16 Jun 2009 02:56:55 +0000 (12:56 +1000)
committerMartin Schwenke <martin@meltin.net>
Tue, 16 Jun 2009 02:56:55 +0000 (12:56 +1000)
commit1f3a602b88f033ca7e2a7176bd7ae30c03d88ab9
tree8c1aa26aa1720319f054a808e1cc0de40288518d
parent9467e39c821bfd98dc19a2951d521db7c68e6862
parentd1c40424f6fd754cc2941b0b42903083af71e087
Merge commit 'origin/master'

(This used to be ctdb commit 8ddd5165f573fc6beaae589b86a6afa4bc17f32a)