merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Wed, 22 Aug 2007 07:31:29 +0000 (17:31 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 22 Aug 2007 07:31:29 +0000 (17:31 +1000)
commitd95476fa3855aef270f9954b5e5c746bcac6e370
tree6c9201526feba5f526755097722d6adb55f379c9
parentdf9ec77b6bfd533e39e616b34a9b54a47158b63c
parent50c09b746508b68c3be84026b6304a9ae25f9345
merge from ronnie
(This used to be ctdb commit e0f1c1acb1188500674626d631e1a1b8726e72ad)