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)
(This used to be commit 63fd551a159b3ad4e314f551d65b7d723bbe485a)


Trivial merge