Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 11:45:46 +0000 (12:45 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 11:45:46 +0000 (12:45 +0100)
commit0ac0ea660ab63eca764149f1d2828d0238a57289
treec8d56c789eb161acdb9e94d9a44c0429322a48a5
parentc45b97c4714dd0565949732394c9c1e8eedbb99a
parent0aff54a12e20d5e91fcdec7aaec103fb9a371a23
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

Conflicts:

source/scripting/python/config.mk
source/script/mkproto.pl
source/scripting/ejs/smbcalls.c