Merge remote branch 'origin/obi/bug_724_wpa_modes' into acid-burn/networking_changes

diff --combined lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
index 4a6b07c7bd0c8b62ec1dbdb4f55acec303d0c356,e629a67dd0aea8278cd0e1d9fe737675aede2fc2..a64a5a6d5277e782fde1950f9d19b2d8271f0932
--- 1/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
--- 2/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
@@@ -265,7 -265,7 +265,7 @@@ class wpaSupplicant
                                fp.write('\tssid="'+essid+'"\n')
                        fp.write('\tscan_ssid=0\n')                     
                        if encrypted:
-                               if encryption == 'WPA' or encryption == 'WPA2' or encryption == 'WPA/WPA2' :
+                               if encryption in ('WPA', 'WPA2', 'WPA/WPA2'):
                                        fp.write('\tkey_mgmt=WPA-PSK\n')
                                        
                                        if encryption == 'WPA':
@@@ -273,15 -273,14 +273,14 @@@
                                                fp.write('\tpairwise=TKIP\n')
                                                fp.write('\tgroup=TKIP\n')
                                        elif encryption == 'WPA2':
+                                               fp.write('\tproto=RSN\n')
+                                               fp.write('\tpairwise=CCMP\n')
+                                               fp.write('\tgroup=CCMP\n')
+                                       else:
                                                fp.write('\tproto=WPA RSN\n')
                                                fp.write('\tpairwise=CCMP TKIP\n')
-                                               fp.write('\tgroup=CCMP TKIP\n')                                         
-                                       else:
-                                               fp.write('\tproto=WPA WPA2\n')
-                                               fp.write('\tpairwise=CCMP\n')
-                                               fp.write('\tgroup=TKIP\n')                                      
+                                               fp.write('\tgroup=CCMP TKIP\n')
                                        fp.write('\tpsk="'+psk+'"\n')
-                                               
                                elif encryption == 'WEP':
                                        fp.write('\tkey_mgmt=NONE\n')
                                        if wepkeytype == 'ASCII':
@@@ -408,7 -407,6 +407,7 @@@ class Status
        def stopWlanConsole(self):
                if self.WlanConsole is not None:
                        print "killing self.WlanConsole"
 +                      self.WlanConsole.killAll()
                        self.WlanConsole = None
                        
        def getDataForInterface(self, iface, callback = None):