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

[Rex Dieter]

commit 2aa00e64e6ddc8abd3fead655d4a9994b36297a3
Merge: 75e6549 83ac6e2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon May 7 20:36:27 2012 -0500

    Merge branch 'master' into f15

 .gitignore                        |    2 +-
 kde-plasma-networkmanagement.spec |   12 +++++++++++-
 sources                           |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---