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


Trivial merge