Merge branch 'ctdb-merge' into v3-2-test
authorAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 15:53:16 +0000 (18:53 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 15:53:16 +0000 (18:53 +0300)

Trivial merge