[kdenetwork/f14/master: 2/2] Merge remote-tracking branch 'origin/master' into f14/master

[Rex Dieter]

commit 3212fa666b3d3e5b5551f575aca722843ac91238
Merge: b56518c 6ad6177
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri May 6 14:02:55 2011 -0500

    Merge remote-tracking branch 'origin/master' into f14/master

 .gitignore                         |    2 +-
 kdenetwork-4.6-CVE-2010-1000.patch |   18 ------------------
 kdenetwork.spec                    |   10 ++++++----
 sources                            |    2 +-
 4 files changed, 8 insertions(+), 24 deletions(-)
---