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

[Rex Dieter]

commit 6d635e1c85ada75bf32ec103f9b7e3a98671f07c
Merge: 911f932 4dae235
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 14 12:35:05 2011 -0500

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

 .gitignore                                         |    5 +---
 ...x-connecting-to-WiFi-when-In-file-unencry.patch |   25 ++++++++++++++++++++
 kde-plasma-networkmanagement.spec                  |   18 ++++++++++++-
 sources                                            |    2 +-
 4 files changed, 43 insertions(+), 7 deletions(-)
---