Merge branch 'ctdb-merge' into v3-2-test
commit175662b5bbb5c8ecd81a60539f5846a938c26a3a
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)
treebed4e6baef6ed262fab0ebed9b82582092b09da2
parentd9c8a2271d5d4ff845f1fe5986a2c63d79c41415
parentee851730cef1eb506b47faf57e25789ad3c6aafa
Merge branch 'ctdb-merge' into v3-2-test