Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:37:58 +0000 (19:37 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:37:58 +0000 (19:37 +0200)
commit964257956d4046658c6177a2423c55d2c5bb9f45
tree24e9e9b0149cf8da7c2581862e7bb77a4942ba06
parentadc84e12865115f15df01676b2040d9e06cafa2c
parent30ad1af106b7cd3b94e65ff30fd268ecfb7b3929
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
(This used to be commit 3a83d4ebd41908aa0f88eec5b05156112ea0ca7b)