Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-defs
authorJelmer Vernooij <jelmer@samba.org>
Thu, 29 May 2008 13:51:24 +0000 (15:51 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 29 May 2008 13:51:24 +0000 (15:51 +0200)
commitb302d3273a3b9e6acc1ff90bbca02fbe2ceb1160
tree5201509b5f932788feeeee2ec6acface46581d34
parent1e7dc5675280d567db1b6a243d48c5617dba5872
parent617ef56aa3378c384026b72871af5a7253b8df33
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-defs
(This used to be commit 3947327f8c4ca530d99bc5ac3d1f6f54727f477a)