Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into nosmbpython
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 May 2008 10:22:05 +0000 (12:22 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 May 2008 10:22:05 +0000 (12:22 +0200)
(This used to be commit 5c56464a6c2f29a039ba3152de83d34778ca0615)


Trivial merge