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)
commitece878c1f9251b83598508e23ce0015b4db72f0a
treea8cb3d9baec40ee05648df06497e332136f6f8d8
parent5632fe8c61cfd7d69ebdc263dcb5740e72f25b95
parent0df2b3e0b56007850cf83cfdcdb45ca29e162d34
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test