[kdenetwork/f14/master: 4/4] merge branch 'master' into f14

[Rex Dieter]

commit 7a06f6a0bcabcd228c006db08e22226d28053d8e
Merge: 1d579af db81c88
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 14:56:04 2010 -0500

    merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	kdenetwork.spec
    	sources

 .gitignore      |    4 ++--
 kdenetwork.spec |    5 ++++-
 sources         |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---