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

[Rex Dieter]

commit c71b0fab5caafa0c1b25991e5eb52a5bd0640077
Merge: 6d635e1 0c46ec9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 24 07:28:19 2011 -0500

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

 .gitignore                                         |    1 +
 ...x-connecting-to-WiFi-when-In-file-unencry.patch |   25 --------------------
 kde-plasma-networkmanagement.spec                  |   14 ++++++----
 sources                                            |    2 +-
 4 files changed, 10 insertions(+), 32 deletions(-)
---