Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Sat, 8 Mar 2008 14:27:32 +0000 (15:27 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 8 Mar 2008 14:27:32 +0000 (15:27 +0100)
commit0c6de7c9598889a469084bf15da49b1a2589cff7
tree0ab6ac4f050e5bfae1620a7ff0a79ea1b0cf6bc7
parent073cf999c0f167478f5c7d302e1e02ea6187e611
parentdb06d932c8f43b02d4a54d0c139310a3890160d5
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit cffaf5f6030b5d9b6d4d802b557fd8ea7afd043d)