[kde-plasma-networkmanagement/f13/master: 18/18] Merge branch 'master' into f13

[Rex Dieter]

commit 320c2f6c82703f3a768dc6b00406dfc39adcb1ef
Merge: 76e96e4 1d62889
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 2 08:18:51 2010 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	kde-plasma-networkmanagement.spec
    	networkmanagement-0.9-disable_kded.patch
    	sources

 .gitignore                               |    1 +
 kde-plasma-networkmanagement.spec        |   22 ++++++++++++++++++----
 networkmanagement-0.9-disable_kded.patch |    7 ++++---
 sources                                  |    2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)
---