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)
commitd3336684f084f984500dd0893dd01bcfc5be0ab1
tree98a90237ac4bef4c1a16e345e23d97c79dad2515
parentc5b287c056855892f30fbbf32efe7d65da31ce91
parent8585a3c77d5dfe97bca3f08716fc06ac2819f578
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
source/scripting/python/samba/provision.py
source/setup/provision