[kdenetwork/f16: 20/20] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit aa68eac7a16e0e867f29bfa59f6f0952118119b4
Merge: 84c4ceb d1f779c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 23:42:02 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kdenetwork.spec
    	sources

 .gitignore                            |    2 +-
 kdenetwork-4.7.97-fix-for-g++47.patch |   14 +++++++++
 kdenetwork.spec                       |   51 +++++++++++++++++++++++++++++---
 sources                               |    2 +-
 4 files changed, 62 insertions(+), 7 deletions(-)
---