[kde-plasma-networkmanagement/f15: 6/6] Merge branch 'master' into f15

[Rex Dieter]

commit f1736e54ed552b1ba68e296e76e2906da357e29c
Merge: 2aa00e6 efb1aff
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jun 19 08:57:53 2012 -0500

    Merge branch 'master' into f15

 .gitignore                                         |    2 +-
 ...rror-when-processing-openconnect-plugin-s.patch |   55 ++++++++++++++++++++
 kde-plasma-networkmanagement.spec                  |   44 ++++++++++++++--
 networkmanagement-0.9.0.3-wpa2ent_dialog.patch     |   32 +++++++++++
 sources                                            |    2 +-
 5 files changed, 128 insertions(+), 7 deletions(-)
---