Merge remote branch 'martins/takeover'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 6 Feb 2012 05:30:49 +0000 (16:30 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 6 Feb 2012 05:30:49 +0000 (16:30 +1100)
commit307cc316abb6bb29bc6da391e99c760cacd959bb
treeb26d7729d75884615a66da25b5b061d87a04c4c4
parent8bcad72c414827039938bbc99810fbcdb19ec39a
parentc7c19397cd2876523d92c587926fadbc7c744c85
Merge remote branch 'martins/takeover'

(This used to be ctdb commit 4948f34676d5bdaaf1ddf8879df618a76013ea1e)