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


Trivial merge