Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Fri, 25 Jan 2008 00:03:13 +0000 (01:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 25 Jan 2008 00:03:13 +0000 (01:03 +0100)
commita4600a5ed0c325c689561b9aed1cd88365a3895c
tree4d5a9045d213c207fcc3bc01bedc24d51e24af5f
parent37f35d2a03409e0d52232d4c4f956ec8637d4884
parentde50115c38f6086237a555a2b2adc314fbbd26e6
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit d35d4f983d1eb7450cd9f92a5217c14ec073396f)