]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
merge from jim
authorAndrew Tridgell <tridge@samba.org>
Tue, 29 May 2007 04:46:29 +0000 (14:46 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 29 May 2007 04:46:29 +0000 (14:46 +1000)
(This used to be ctdb commit a41acd1835af91176a2de1c251a8709dc42b65ac)


Trivial merge