]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Sun, 22 Apr 2007 12:31:11 +0000 (22:31 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Sun, 22 Apr 2007 12:31:11 +0000 (22:31 +1000)
(This used to be ctdb commit 1c33c9856c05068a5681f3e37c9b94f429038a69)


Trivial merge