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 15:11:13 +0000 (16:11 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 21 Feb 2008 15:11:13 +0000 (16:11 +0100)
commit10e7f9f02d3b952c924e7c98ce01d27cc6baac84
treecdc3655b8ebf084031aa84c4967333d176994315
parent426e7fef1f080f22a10e89cebae58a40db8bc77f
parent141f4b8f838f750b979eeef11743244008bfa339
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 52a8d06f00ab3900e2186e047902dbcbe3138a01)