Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Tue, 22 Apr 2008 20:19:46 +0000 (22:19 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 22 Apr 2008 20:19:46 +0000 (22:19 +0200)
(This used to be commit 10a1a53d8beb56b7e12149c50e2685a1578413b9)


Trivial merge