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

[Rex Dieter]

commit 1744435d0ffc7e557485649b5266e19253b06f87
Merge: 03b5b87 2af0ce2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Nov 27 10:17:30 2011 -0600

    Merge branch 'master' into f15

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