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

[Rex Dieter]

commit acfe2d8ab1cf1a41dc2a26441eb5a793166ba365
Merge: 839272d 374f710
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 9 12:02:47 2010 -0500

    Merge remote branch 'origin/master' into f14/master
    
    Conflicts:
    	kde-plasma-networkmanagement.spec

 .gitignore                        |    2 +-
 kde-plasma-networkmanagement.spec |   10 ++++++----
 sources                           |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --cc kde-plasma-networkmanagement.spec
index faeaebd,5c930e4..bc34557
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@@ -280,8 -280,11 +280,10 @@@ gtk-update-icon-cache %{_kde4_iconsdir}
  
  
  %changelog
- * Wed Sep 29 2010 jkeating - 1:0.9-0.25.20100920.1
- - Rebuilt for gcc bug 634757
+ * Fri Oct 08 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.27.20101008
+ - 20101008 snapshot, includes new Adding Mobile Connection Wizard
+ 
+ * 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