Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 13524)
+++ /tools/gformat.py	(revision 13525)
@@ -685,6 +685,6 @@
         
       output += "wlans_%(autogen_ifbase)s='%(autogen_ifname)s'\n" % ifacedump
-      output += ("create_args_%(autogen_ifname)s='wlanmode %(autogen_wlanmode)s mode " +\
-        "%(type)s ssid \"%(ssid)s\" %(autogen_extra)s channel %(channel)s'\n") % ifacedump
+      output += ("create_args_%(autogen_ifname)s=\"wlanmode %(autogen_wlanmode)s mode " +\
+        "%(type)s ssid \\\"%(ssid)s\\\" %(autogen_extra)s channel %(channel)s\"\n") % ifacedump
       output += "\n"
 
@@ -892,5 +892,4 @@
 
   output += "\n"
-  output += "cloned_interfaces='bridge0'\n"
 
   # Details like SSID
@@ -917,5 +916,8 @@
 
     if iface == 'bridge0':
-      output += "ifconfig_bridge0='addm %s %s up'\n" % (' addm '.join(datadump['autogen_dhcp_interfaces']), addrs[0][0])
+      output += "cloned_interfaces='bridge0'\n"
+      output += "autobridge_interfaces='bridge0'\n"
+      output += "autobridge_bridge0='%s'\n" % ' '.join(datadump['autogen_dhcp_interfaces'])
+      output += "ifconfig_bridge0='%s up'\n" % addrs[0][0]
     else:
       output += "ifconfig_%s='inet %s'\n" % (iface, addrs[0][0])