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)
commite367df5d994181f08ad1a20a0ce01991ca30bcc8
treea517762ce35dae9bdd03295e1ea3153c3db882ad
parent73d1b0fcb64fdc7be1e1e1002f3f182fcbe476ae
parentc8b0a8a196d8d187a86aef497953d0105436aff8
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

Conflicts:

source/scripting/python/samba/provision.py
source/scripting/python/samba/provision.py