2b870f4 Merge branch 'master' of ssh://pkgs.fedoraproject.org/kde-plasma-networkmanagement into f16

Merged and Committed by Kevin Kofler 12 years ago