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)
commit64babbec22f165e34799d36ff4b76806d9fead50
treeb6d26ef1503672ff66607a928aa3f444adfb5e10
parent04fe8c8aefae8da8966954d0654c37adf2d0361d
parent3131847cb67dadd8ee6fcbca5055927b8ba8a219
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