Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
commit5d5c8a09f07ae441d44f6aaa2fb60a594256fd42
authorAndrew Tridgell <tridge@samba.org>
Sat, 7 Jun 2008 05:11:00 +0000 (6 22:11 -0700)
committerAndrew Tridgell <tridge@samba.org>
Sat, 7 Jun 2008 05:11:00 +0000 (6 22:11 -0700)
treed31cdfe3f333d20e16b031cf59a66fcaf41d747e
parente97cf207fac5e4101376d2a10dd95a93a9a1e0fb
parentd51904c48970265e84c303ae97502152b85da587
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 8e96f2edb003d997e71e9e237463882696279d0f)