Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 May 2008 23:48:20 +0000 (01:48 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 May 2008 23:48:20 +0000 (01:48 +0200)
(This used to be commit 30f8d581aa339b37b27011e65355937590df10b9)


Trivial merge