Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Thu, 28 Feb 2008 13:11:45 +0000 (14:11 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 28 Feb 2008 13:11:45 +0000 (14:11 +0100)
(This used to be commit 84b677285250d9b9a1120fcfd6e4bbbb8f939fe8)


Trivial merge