]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Fri, 6 Jul 2007 00:48:46 +0000 (10:48 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Fri, 6 Jul 2007 00:48:46 +0000 (10:48 +1000)
(This used to be ctdb commit 1385198344abb55c811edb955fbbc06bf72a1fb5)


Trivial merge