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)
commitcceac63aaab26a72e2f3fd150dd1e4e83a0e5279
tree6203cca724fc5f17f068e3fd4d0b403fdff3f8f9
parent7c7880695b02df4cbe0faab959846c63d0cc0536
parent72fce654072b2d7317ff21c95558bd365701d5dd
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-wsgi

Conflicts:

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