[kdenetwork/f13/master: 26/26] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 01c633748a1b6ba66f3cc1d0ae28206fa814b6d1
Merge: 8f94ccd 30da4af
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 08:54:48 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdenetwork.spec
    	sources

 .gitignore      |    4 ++--
 kdenetwork.spec |   40 ++++++++++++++++++++++++++++++----------
 sources         |    2 +-
 3 files changed, 33 insertions(+), 13 deletions(-)
---