Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 18:35:01 +0000 (20:35 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 18:35:01 +0000 (20:35 +0200)
commit63fd551a159b3ad4e314f551d65b7d723bbe485a
treedfff99aef7ec25a972dea9b19ea9ff6bd00ab12f
parent3a83d4ebd41908aa0f88eec5b05156112ea0ca7b
parent6b6b2196a8a8d9e741f5c399185ded7a16938da0
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test