Merge from tridge
authorAlexander Bokovoy <ab@samba.org>
Wed, 29 Nov 2006 09:37:24 +0000 (12:37 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 29 Nov 2006 09:37:24 +0000 (12:37 +0300)
commit8077af9f37503376998632ca400ecc4da9cbeccd
treea476fceca3959170fc1d7f5072590110816a4111
parent238439d736abaa0476687466f3a2acf245affadb
parentfcae7fb9ca397df7f69d099b5dfa40d1f3d21de8
Merge from tridge

(This used to be ctdb commit dfca91b3ed5ee3c4531dd9c883bf39dbb8eececa)