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)
Conflicts:

source/scripting/python/samba/provision.py


No differences found