[kde-plasma-networkmanagement/f15: 2/2] Merge branch 'f16' into f15

[Rex Dieter]

commit 75e6549752ad660e072630d62ae04abbe69d9a35
Merge: 49b0ad8 50e1331
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Apr 10 08:43:38 2012 -0500

    Merge branch 'f16' into f15

 .gitignore                        |    5 +---
 kde-plasma-networkmanagement.spec |   45 +++++++++++++++++++-----------------
 sources                           |    2 +-
 3 files changed, 26 insertions(+), 26 deletions(-)
---