Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-wsgi
authorJelmer Vernooij <jelmer@samba.org>
Fri, 23 May 2008 14:24:07 +0000 (16:24 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 23 May 2008 14:24:07 +0000 (16:24 +0200)
commitd27de633656f8a699222df77c4c58326890889a2
tree78ca2dede5cdaac43f9d9dfe70415ccf08933db7
parentd16b30d005933c9cc73f9196a3b77829d23687a0
parent0f2de29dae1b29030c2c7bcee609919fce0d674b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-wsgi

Conflicts:

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