Merge commit 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 17 Jul 2009 02:45:08 +0000 (12:45 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 17 Jul 2009 02:45:08 +0000 (12:45 +1000)
commit4a405e564e2a2ef5c64dae75b8e79dc47b25c87a
tree8a985ae5a10341913b7adc693a72351dfdf86d25
parent6db0f01532795689e65e0e19d49c9974ac979f96
parentd846eb78db51ca09543b388a7867f1c212a5fadd
Merge commit 'martins/master'

(This used to be ctdb commit febf3d6d3f2bdf187c042f560aefc54b8ac72454)