Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 10:31:40 +0000 (11:31 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 10:31:40 +0000 (11:31 +0100)
(This used to be commit 2fb93e85eb5f415fbcdfb2fc0a1a58fad823138a)


Trivial merge