Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 25 Jul 2008 01:58:51 +0000 (11:58 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 25 Jul 2008 01:58:51 +0000 (11:58 +1000)
(This used to be commit b12dd8ee5443ebfc204d1684f541d68ffb351197)

1  2 
source4/dsdb/samdb/ldb_modules/rootdse.c
source4/dsdb/schema/schema_init.c
source4/scripting/python/samba/provision.py

Simple merge