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

Trivial merge