]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
merge from tridge
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Sat, 14 Apr 2007 21:41:35 +0000 (07:41 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Sat, 14 Apr 2007 21:41:35 +0000 (07:41 +1000)
(This used to be ctdb commit 7e111784a156cc6ed15645db4a911701673d7c2a)


Trivial merge