Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Fri, 25 Jan 2008 10:50:00 +0000 (11:50 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 25 Jan 2008 10:50:00 +0000 (11:50 +0100)
commit1c5e713cceb6a4467540043df4087fe3f9f335d5
tree1c93f2ab8c76694a91d8e57394f77f4b872fec8b
parent6c2d4f2806bae8072d61ba8795832d9a9e75573e
parent5d55aa99e6488244208d7d84b188f92306c083f6
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 64babbec22f165e34799d36ff4b76806d9fead50)
source4/scripting/python/samba/provision.py