merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Wed, 9 May 2007 01:54:37 +0000 (11:54 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 9 May 2007 01:54:37 +0000 (11:54 +1000)
commitd2a90cc5a5108526df90ffdc954c89e8c83b9e78
tree1fc25c5c6b7863cf93b8a44835b43e8d25115521
parentfdb8144e622a3cdeb1e74187789a1a0d0f23e0db
parent6929739b7f90ea278e4b065f8b41c998b5c0c6f5
merge from ronnie
(This used to be ctdb commit f67a4842e7b1efb2ad61c41e4895c7698e564bf3)