]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Mon, 24 Sep 2007 00:27:48 +0000 (10:27 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Mon, 24 Sep 2007 00:27:48 +0000 (10:27 +1000)
(This used to be ctdb commit 7f9242747543ea1a2cc05f5c8afc51ab26e7d4bb)


Trivial merge