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)
commitf29e9009310e4a6d575651dd9ba41ffc90bfb386
tree5a070bbfe75c4ef2b3ed2d0c3c52fa2ed182b334
parentf0914d0187130adcd4f239d4ea0fc9f729fdedc9
parentc52fe1fe1c77636d87355d3c4baa66e052fe9008
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into nosmbpython