]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Merge from tridge
authorAlexander Bokovoy <ab@samba.org>
Wed, 29 Nov 2006 09:37:24 +0000 (12:37 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 29 Nov 2006 09:37:24 +0000 (12:37 +0300)
(This used to be ctdb commit dfca91b3ed5ee3c4531dd9c883bf39dbb8eececa)


Trivial merge