Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-defs
authorJelmer Vernooij <jelmer@samba.org>
Thu, 29 May 2008 13:51:24 +0000 (15:51 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 29 May 2008 13:51:24 +0000 (15:51 +0200)
(This used to be commit 3947327f8c4ca530d99bc5ac3d1f6f54727f477a)


Trivial merge