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)
commita1411c1a264c36fb382e5f549476e41a81ea7935
tree01cda04a0fa70767a301b099b8fecf603a7e9920
parent0c357edb13a3120e1d2a8e4f6f4c82a96d43d49b
parentaed93a238e13247945073921d91408c91ae210c3
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into nosmbpython
(This used to be commit f29e9009310e4a6d575651dd9ba41ffc90bfb386)