Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 25 Jan 2008 12:16:34 +0000 (23:16 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 25 Jan 2008 12:16:34 +0000 (23:16 +1100)
commit1e042908992cdf3149ffc24472c7f0b1c3f9edef
tree0607a0494d44eb01e6067344b65ea819c9cd564a
parentf0ffbb8e19c1085bf54d226f62c667868e14f62e
parentf3ebaf0a0c0b881da28063c69bb6306f6aa1c774
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test