Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Mon, 17 Aug 2009 03:08:42 +0000 (13:08 +1000)
committerMartin Schwenke <martin@meltin.net>
Mon, 17 Aug 2009 03:08:42 +0000 (13:08 +1000)
commitd2e149daa41ec6ab44185298dd6cc51a69cc8942
tree844c52bf366ae8641c6f2704c05684a4c131d5cb
parentbd98b6c6997045770b8cccc5f2f31e9551ab8b07
parent9927ea7a004fe7a8d84dc74b1d1130f838c44d0f
Merge commit 'origin/master'

(This used to be ctdb commit 8ed4fa0eb09238952044645b72234185e498a40c)