[kde-plasma-networkmanagement/f14/master: 2/2] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit 5cf13b2bed12a0a4ac35771c4e7b1403fedad88a
Merge: 4029e5f bcb8e6f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 11 11:01:42 2010 -0500

    Merge remote branch 'origin/master' into f14/master

 kde-plasma-networkmanagement.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --cc kde-plasma-networkmanagement.spec
index cb9bd18,7eeaca3..23ecdd6
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@@ -278,11 -277,13 +277,12 @@@ gtk-update-icon-cache %{_kde4_iconsdir}
  * Mon Oct 11 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.28.20101011
  - 20101011 snapshot
  - KDE NM applet 20101008 snapshot crashes on new CDMA connection (#641792)
+ - Add NetworkManager dependency to knetworkmanager (#618918)
  
  * Fri Oct 08 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.27.20101008
- - 20101008 snapshot, includes new Adding Mobile Connection Wizard
+ - 20101008 snapshot, includes new Adding Mobile Connection Wizard (#584124)
  
  * Wed Sep 29 2010 jkeating - 1:0.9-0.26.20100920
 -- Rebuilt for gcc bug 634757
  
  * Wed Sep 22 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.25.20100920
  - make plasma_applet unconditional