Fix merge of my host GUID removal and the IPv6 addition to provision
authorAndrew Bartlett <abartlet@samba.org>
Wed, 2 Apr 2008 01:03:03 +0000 (12:03 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 2 Apr 2008 01:03:03 +0000 (12:03 +1100)
commit4ccb384327d2f1b8c7d1e6ac4806062888154513
tree4f553f54e781f201b2269355ca95925938b331c4
parent2ab6dd9ea58c7f09791f45077df084447fc7de69
parent3c0c6acc594fba1f1d28e49cb105c99fa1649a18
Fix merge of my host GUID removal and the IPv6 addition to provision

Merge branch 'v4-0-ipv6' of git://git.id10ts.net/samba into 4-0-abartlet

Andrew Bartlett
(This used to be commit d3336684f084f984500dd0893dd01bcfc5be0ab1)
source4/scripting/python/samba/provision.py
source4/setup/provision