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 12:23:25 +0000 (22:23 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 29 May 2008 12:23:25 +0000 (22:23 +1000)
commit2371de92a08a1fb63ba458bba3cee5a251419579
tree07d024c868e6dbd61268cef960dff335965fb06e
parentf0bc7c07fe3148adee4ee625fcfc24cd5d4cc034
parent617ef56aa3378c384026b72871af5a7253b8df33
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit e728596eec2157eefb1fe72789284567f3880388)