[kde-plasma-networkmanagement/f15: 12/12] Merge remote-tracking branch 'origin/master' into f15

[Rex Dieter]

commit ffe6151a996cd991ec97106d1653a96be47963f2
Merge: 5701c50 ff4b1a5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jun 17 07:16:23 2011 -0500

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

 .gitignore                                   |    5 +-
 kde-plasma-networkmanagement.spec            |   65 ++++---
 networkmanagement-0.9-20110323-#710996.patch |   23 ---
 nm-09-compat.patch                           |  244 --------------------------
 sources                                      |    2 +-
 5 files changed, 39 insertions(+), 300 deletions(-)
---