Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Fri, 25 Jan 2008 00:03:13 +0000 (01:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 25 Jan 2008 00:03:13 +0000 (01:03 +0100)
(This used to be commit d35d4f983d1eb7450cd9f92a5217c14ec073396f)


Trivial merge