]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Wed, 11 Apr 2007 12:11:07 +0000 (22:11 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 11 Apr 2007 12:11:07 +0000 (22:11 +1000)
(This used to be ctdb commit 6cd4b1ec40b51f491d25173a7dde0864f525e7ef)


Trivial merge