[kdenetwork/f17: 11/11] Merge branch 'master' into f17

[Rex Dieter]

commit b0603f2c10e1687da9fc713dc8f37e4ce7a666e6
Merge: c5dcc97 793a8d8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 12:02:07 2012 -0500

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

 .gitignore      |    1 +
 kdenetwork.spec |   35 ++++++++++++++++++++++++++++-------
 sources         |    2 +-
 3 files changed, 30 insertions(+), 8 deletions(-)
---