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

[Rex Dieter]

commit 4fd95837fa55a4d7f1cc5f3e27c0560eaa3d40e2
Merge: 03b5b87 2af0ce2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Nov 27 10:16:12 2011 -0600

    Merge branch 'master' into f16

 .gitignore                        |    6 +-----
 kde-plasma-networkmanagement.spec |    9 ++++++---
 sources                           |    2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)
---