Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 29 May 2008 21:50:22 +0000 (07:50 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 29 May 2008 21:50:22 +0000 (07:50 +1000)
commit931d3d8fc5d9aa8ccb16018179fafa35968bb967
tree121c10424b2307def6d900ee44c21d89354f5b28
parent6ef9674caa67c1f086285f1bee17c6f390778588
parent6f7b2b69333230016a9538b024faec0d97095c69
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit d335fd11637f5e138b08a5e0fcf54b19cef9a646)