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)
commit08067d22a0cb24fe1b9d6230634aea89c493bd4e
treed6421f3eb3c94a27ee99ecf73a7cf31809e5dc09
parent964257956d4046658c6177a2423c55d2c5bb9f45
parent333c169529a3f64a28fcaff1056069867fd56a90
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
(This used to be commit 63fd551a159b3ad4e314f551d65b7d723bbe485a)