[kdenetwork/f19: 13/13] Merge branch 'master' into f19

[Rex Dieter]

commit b01be0178076ca54dea1a4a9eb75034d0709b994
Merge: 1563e24 ab6443e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 15:34:31 2013 -0500

    Merge branch 'master' into f19

 .gitignore                                   |    1 -
 kdenetwork-4.10.0-kopete_system_iris.patch   |   61 ---
 kdenetwork-4.10.2-v4l_deprecations.patch     |   16 -
 kdenetwork-4.10.4-krdc_icon.patch            |   18 -
 kdenetwork-4.10.5-freerdp.patch              |  567 --------------------------
 kdenetwork-4.10.5-kget-doc.patch             |   18 -
 kdenetwork-4.10.5-kppp-strict-aliasing.patch |   12 -
 kdenetwork-4.10.5-mediastreamer29.patch      |   65 ---
 kdenetwork-4.3.3-resolv-conf-path.patch      |   21 -
 kdenetwork-4.7.97-fix-for-g++47.patch        |   14 -
 kdenetwork-4.9.5-libjingle_openssl.patch     |   12 -
 kdenetwork.spec                              |  556 ++-----------------------
 kppp.console                                 |    3 -
 kppp.pam                                     |    4 -
 sources                                      |    2 -
 15 files changed, 44 insertions(+), 1326 deletions(-)
---