Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into nosmbpython
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 May 2008 13:45:04 +0000 (15:45 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 May 2008 13:45:04 +0000 (15:45 +0200)
(This used to be commit f29e9009310e4a6d575651dd9ba41ffc90bfb386)


Trivial merge