Merge branch 'ctdb-merge' into v3-2-test
commit02680bd75d803c1b54b39e95af5224fb98d1b723
authorAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 15:53:16 +0000 (16 18:53 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 15:53:16 +0000 (16 18:53 +0300)
tree43516dab9b60fa5e5aadc79ee5c54c64687aadb8
parent587a2dbf8d000640109c2b36a924cd4c2694897f
parent024741500abd30ac74adfdfa88694026792ba284
Merge branch 'ctdb-merge' into v3-2-test
(This used to be commit 175662b5bbb5c8ecd81a60539f5846a938c26a3a)