Merge leftovers of 0e1a86bc845 in 3-0-ctdb
commit8ed9df8af219a144f5580662b3c948c3da46b4b4
authorVolker Lendecke <vl@samba.org>
Mon, 17 Mar 2008 13:40:07 +0000 (17 14:40 +0100)
committerKarolin Seeger <kseeger@samba.org>
Tue, 18 Mar 2008 11:10:54 +0000 (18 12:10 +0100)
tree10054c565d26d58d80cce4da72b131e9d64efc4d
parent3cd8ef9790f6c5cae0f1203a6f76e3f6e695392e
Merge leftovers of 0e1a86bc845 in 3-0-ctdb
(cherry picked from commit 64b1625f8e3bca43504871747bef6631e1b18f44)
source/locking/brlock.c
source/locking/locking.c