]> git.samba.org - metze/samba/wip.git/commitdiff
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Thu, 21 Feb 2008 00:07:06 +0000 (01:07 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 21 Feb 2008 00:07:06 +0000 (01:07 +0100)
(This used to be commit 1bb673ce4e84088bc77d490101e8904cf9a467a2)


Trivial merge