[kde-plasma-networkmanagement/f12/master: 32/32] Merge branch 'master' into f12

[Rex Dieter]

commit 52f0c3c22b16b53a1a54a93b0ad4d645abb2e217
Merge: 31cd6ee 1d62889
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 2 08:21:04 2010 -0500

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

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