Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 6 Mar 2008 20:38:44 +0000 (07:38 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 6 Mar 2008 20:38:44 +0000 (07:38 +1100)
commit449c0c52428e79ffcaa520c590df468b10397fb3
treeeaf0e4ad65284ffe72194d11e1a970da251eea2d
parent8b24d248b7c928fd3b20f95ede34302ca274c4ae
parent7eaa6b5f9a316d658c3ecf98b44a4cdf8a2de512
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit a6997c333cdd68dfba8a069df448836ff487787f)
source4/scripting/python/samba/provision.py