Merge branch 'ctdb-merge' into dmapi-integration
authorAlexander Bokovoy <ab@samba.org>
Tue, 29 Jan 2008 13:19:21 +0000 (16:19 +0300)
committerAlexander Bokovoy <ab@samba.org>
Tue, 29 Jan 2008 13:19:21 +0000 (16:19 +0300)

Trivial merge