Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 2 Mar 2008 23:40:01 +0000 (00:40 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 2 Mar 2008 23:40:01 +0000 (00:40 +0100)
(This used to be commit 3d4cbaeec6eafc0fec06ba472ac2bd55ae3a0d11)


Trivial merge