Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Thu, 5 Jun 2008 20:03:17 +0000 (22:03 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 5 Jun 2008 20:03:17 +0000 (22:03 +0200)
commitd51904c48970265e84c303ae97502152b85da587
treedfb75ae9712bac4ab6e25bd3bb3d79b6465685f0
parentd05ca8cbba364b65780d35a32495d6388bc3caa8
parentc6cc3cb88ec271da6c372ec881ea66ab8f6e2b68
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit dcdfee611ccc0ae798e3eea2cfdf3c7642dc5677)