Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Thu, 17 Apr 2008 11:05:25 +0000 (13:05 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 17 Apr 2008 11:05:25 +0000 (13:05 +0200)
commitdd0da89e841e5df0c1fe27122df0c1644278c65e
tree75de1500ca458d977c36831491a9495738da9c2c
parent0197b8e0ff8dc26eeb71dccf61d8937c63bacff5
parent4d8f3f190215edcdbeb1725cccdc962dc68cc1a0
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit ece878c1f9251b83598508e23ce0015b4db72f0a)