Merge remote branch 'amitay/tdb-sync'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 25 Apr 2012 22:09:34 +0000 (08:09 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 25 Apr 2012 22:09:34 +0000 (08:09 +1000)
(This used to be ctdb commit 8052ee0a6bda3fa88501d77b2d53315be2b75ec1)


Trivial merge