Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:07:17 +0000 (19:07 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:07:17 +0000 (19:07 +0200)
commitad58defe129d25ea2e8a598934800610189747e8
tree11062aa933bf8b506ce02360cf330078765121fb
parent84c9fbe8466e013e501eecf9b2e7981c1df8232c
parentfb10a81b9484642099ecbe896eabe00a4417bc42
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test