]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
merge from tridges tree
authorRonnie Sahlberg <sahlberg@ronnie>
Sat, 21 Apr 2007 07:57:50 +0000 (17:57 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Sat, 21 Apr 2007 07:57:50 +0000 (17:57 +1000)
(This used to be ctdb commit d3fdb22eec5fd21132e2a9ab19ebbb21217ccec9)


Trivial merge