Merge commit 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 30 Jul 2009 00:55:56 +0000 (10:55 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 30 Jul 2009 00:55:56 +0000 (10:55 +1000)
commit690f1537f031b05ae8013d8eea4136eb9c7bf163
treefb38cf4c16c3095f893de0f07003282526d13766
parenta1e1503328f408fe067000962c93d1a2ee70dad1
parent063bd6e2787c2791e6ae993278699e3076b0824f
Merge commit 'martins/master'

(This used to be ctdb commit 32a69b0efa078b069802470be6488a4efe32961d)