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