Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Mon, 3 Mar 2008 09:50:53 +0000 (10:50 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 3 Mar 2008 09:50:53 +0000 (10:50 +0100)
commit7dd0cd26d32980d4edb9db5c77c98a2b112e24cb
tree025dad49b789c0e9f2eb03d87ec386295630b3f0
parent80e9b72e018fb7d7f2cd5ff383e4a533b4ccc705
parent4d4a898742a0439d3f60c84194b02901412f4679
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

Conflicts:

source/Makefile
source/build/smb_build/makefile.pm
source/librpc/config.mk
(This used to be commit 3e02fcfd3fb6683f51417ba39f4ec177494eff3e)
source4/Makefile
source4/build/smb_build/makefile.pm