Merge branch 'master' into wspp-schema
commit631e688c821b78d09d77f5940074800525c554aa
authorAndrew Tridgell <tridge@samba.org>
Tue, 31 Mar 2009 00:58:37 +0000 (31 11:58 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 31 Mar 2009 00:58:37 +0000 (31 11:58 +1100)
tree74473f1727ea0afa27d9c15e50e4638c4d8faf28
parent13be4d7ff42bd2b8bf5702a499c482404e5cd164
parent4b8e4ea7286f045effb6feb4c7bf8c5ef4ed2f9b
Merge branch 'master' into wspp-schema
source4/scripting/python/samba/provision.py