]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Fri, 4 May 2007 01:51:07 +0000 (11:51 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Fri, 4 May 2007 01:51:07 +0000 (11:51 +1000)
(This used to be ctdb commit 5724d41352df252151e54ecdb02baa7f82c3aabf)


Trivial merge