Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sat, 1 Mar 2008 11:23:08 +0000 (12:23 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 1 Mar 2008 11:23:08 +0000 (12:23 +0100)
(This used to be commit cfd1a91c6e319bc28a60bb6aae4443b1246500cb)


Trivial merge