[kdenetwork/f18: 22/22] Merge branch 'master' into f18

[Rex Dieter]

commit 81d90189982744aa14d830d322e58febf44dd930
Merge: 1b2841c 354cf87
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 18:00:56 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kdenetwork.spec
    	sources

 .gitignore                                 |    3 +-
 kdenetwork-4.10.0-kopete_system_iris.patch |   61 ++++++++++++++++++++++++++++
 kdenetwork.spec                            |   46 +++++++++++++++++----
 sources                                    |    2 +-
 4 files changed, 101 insertions(+), 11 deletions(-)
---