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

[Rex Dieter]

commit 695061f9dc44c17c09b91cd0d019d4178398b831
Merge: 2dfa3e1 008173a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Feb 20 17:34:26 2011 -0600

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

 .gitignore                             |    2 +
 kde-plasma-networkmanagement.spec      |   37 +-
 networkmanagement-bssid.patch          |  160 ------
 networkmanagement-vpn_always_ask.patch |  874 --------------------------------
 sources                                |    2 +-
 5 files changed, 21 insertions(+), 1054 deletions(-)
---