Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
authorJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 09:55:19 +0000 (11:55 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 09:55:19 +0000 (11:55 +0200)
(This used to be commit 9d3d64e1387e9f20383c255bba27128cf4b9519e)


Trivial merge