Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into tmp
authorJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 14:53:10 +0000 (16:53 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 14:53:10 +0000 (16:53 +0200)
commit36c8725d43982f94f9e20b5b26d7e9e7587cfaf3
tree8f2e5f83b67e5092eef5f62dac950f6c5df3517e
parent21f1f3aa686abbe6cc15b46108ee70b2e7538838
parent67bf4bab3ddaf8d1dfaee92007700d8f05a1c191
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into tmp
(This used to be commit d777a83b8478bf09a45eccde38036eccbd219df8)