diff -u plasma-widget-network-manager-0.0+svn930811/debian/changelog plasma-widget-network-manager-0.0+svn930811/debian/changelog
--- plasma-widget-network-manager-0.0+svn930811/debian/changelog
+++ plasma-widget-network-manager-0.0+svn930811/debian/changelog
@@ -1,3 +1,10 @@
+plasma-widget-network-manager (0.0+svn930811-0ubuntu3~ppa1) jaunty; urgency=low
+
+  * Don't set peaplabel when not configured or when using peapver 0 
+    (fixes #334052)
+
+ -- Per Hermansson <perher@kth.se>  Mon, 23 Mar 2009 17:49:10 +0100
+
 plasma-widget-network-manager (0.0+svn930811-0ubuntu2) jaunty; urgency=low
 
   * Add kubntu_01_place_kcm_in_network_kcm.diff to place the network manager
diff -u plasma-widget-network-manager-0.0+svn930811/debian/patches/series plasma-widget-network-manager-0.0+svn930811/debian/patches/series
--- plasma-widget-network-manager-0.0+svn930811/debian/patches/series
+++ plasma-widget-network-manager-0.0+svn930811/debian/patches/series
@@ -1,0 +2 @@
+kubuntu_02_fix_wpa_enteprise_by_excluding_peaplabel.diff
only in patch2:
unchanged:
--- plasma-widget-network-manager-0.0+svn930811.orig/debian/patches/kubuntu_02_fix_wpa_enteprise_by_excluding_peaplabel.diff
+++ plasma-widget-network-manager-0.0+svn930811/debian/patches/kubuntu_02_fix_wpa_enteprise_by_excluding_peaplabel.diff
@@ -0,0 +1,41 @@
+diff -ur plasma-widget-network-manager-0.0+svn930811.orig/libs/storage/settings/802-1xdbus.cpp plasma-widget-network-manager-0.0+svn930811/libs/storage/settings/802-1xdbus.cpp
+--- plasma-widget-network-manager-0.0+svn930811.orig/libs/storage/settings/802-1xdbus.cpp	2009-02-24 11:54:16.000000000 +0100
++++ plasma-widget-network-manager-0.0+svn930811/libs/storage/settings/802-1xdbus.cpp	2009-03-23 17:15:16.367154596 +0100
+@@ -110,9 +110,12 @@
+         break;
+       case Security8021xSetting::EnumPhase1peapver::one:
+         map.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_PEAPVER), 1);
++	// phaselabel only valid with peapver=1
++	if (!setting->phase1peaplabel().isEmpty()) {
++	  map.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_PEAPLABEL), setting->phase1peaplabel());
++	}
+         break;
+     }
+-    map.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_PEAPLABEL), setting->phase1peaplabel());
+   }
+   if (!setting->phase1fastprovisioning().isEmpty()) {
+     map.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING), setting->phase1fastprovisioning());
+diff -ur plasma-widget-network-manager-0.0+svn930811.orig/libs/storage/settings_hand_edits.diff plasma-widget-network-manager-0.0+svn930811/libs/storage/settings_hand_edits.diff
+--- plasma-widget-network-manager-0.0+svn930811.orig/libs/storage/settings_hand_edits.diff	2009-02-24 11:54:16.000000000 +0100
++++ plasma-widget-network-manager-0.0+svn930811/libs/storage/settings_hand_edits.diff	2009-03-23 17:39:31.707149656 +0100
+@@ -1324,3 +1324,20 @@
+ Only in settings: vpnpersistence.h~
+ Only in settings: wephash.cpp
+ Only in settings: wephash.h
++diff -ur origsettings/802-1xdbus.cpp settings/802-1xdbus.cpp
++--- origsettings/802-1xdbus.cpp	2009-02-24 11:54:16.000000000 +0100
+++++ settings/802-1xdbus.cpp	2009-03-23 17:15:16.367154596 +0100
++@@ -110,9 +110,12 @@
++         break;
++       case Security8021xSetting::EnumPhase1peapver::one:
++         map.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_PEAPVER), 1);
+++	// phaselabel only valid with peapver=1
+++	if (!setting->phase1peaplabel().isEmpty()) {
+++	  map.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_PEAPLABEL), setting->phase1peaplabel());
+++	}
++         break;
++     }
++-    map.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_PEAPLABEL), setting->phase1peaplabel());
++   }
++   if (!setting->phase1fastprovisioning().isEmpty()) {
++     map.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING), setting->phase1fastprovisioning());