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)
commit58e10b280d4a94a812bad07bbca049cddb2c1174
treef9910a8c17a563acc100eefb501d31f7d62335b7
parent618d247420a36bf6d0a0026e85b77205ed122657
parent83015a11cc3da3358c267680c0b85be5a6b58932
Merge remote branch 'amitay/talloc-sync'

(This used to be ctdb commit fdd5b9ac0a79f6bc7c8a05da2e2f11e002392bcd)