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)
commitc8011b5d09390318ea6aa5639a142797128e5dab
treefb14b7ecce720dbc4fbba831a8fab045b9ac5f5c
parentbc1a369a0ed254ede591b65756d75568c45549ea
parentde4a2214efb3fcc1aa04664371983dbc768eaf79
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

Conflicts:

source/scripting/python/config.mk
(This used to be commit 0ac0ea660ab63eca764149f1d2828d0238a57289)
source4/script/mkproto.pl
source4/scripting/ejs/smbcalls.c