Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Fri, 8 Feb 2008 13:02:22 +0000 (14:02 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 8 Feb 2008 13:02:22 +0000 (14:02 +0100)
commitf47093baf0a91c717297ebcbd1d3416d788ba6aa
treee1033c9b06c5067c8bbae54ab26c49050db0886e
parentfffe4f3bdd27b11dce75c9b2c931f5291f04ab6b
parent0efa783849ff4bd449cdcc5f643f0101d48746bb
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

Conflicts:

source/scripting/python/samba/provision.py
(This used to be commit e367df5d994181f08ad1a20a0ce01991ca30bcc8)
source4/scripting/python/samba/provision.py