Merge remote branch 'martins/ganesha'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 17 May 2012 01:48:07 +0000 (11:48 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 17 May 2012 01:48:07 +0000 (11:48 +1000)
commit383711ac82cc9ed9a6e08367ef6e74dea85eec61
tree752341c0b90cb07cf42909b8daed27faffbb79a2
parentdce5969d1262f759abd7ba10602ff37ba6f5a3aa
parent835e0b6d49d1f3cbac998c7e4163ad2ccc1f20b6
Merge remote branch 'martins/ganesha'

(This used to be ctdb commit f23b5a160184db8c92f8c69307dc4a64adae839d)