Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
commitd975cd9d8c3fc504a8ccbb80f239d4648ac0c304
authorAndrew Bartlett <abartlet@samba.org>
Sat, 17 May 2008 11:16:22 +0000 (17 21:16 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 17 May 2008 11:16:22 +0000 (17 21:16 +1000)
tree8272375ede8a170bdd7b09d48db833248c65a54d
parentfd0d47b746be322b60fca29c1daa13e72b360e62
parent250478d0445cf56e8b0b4e876977a9ae968ff55b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 60579269d1e0bebce5b595ef95d68fd4bf781cfd)