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

[Than Ngo]

commit b56518c2cbb6a263da7ce12a9d96bede676f9c9c
Merge: f9b7cff c236fa7
Author: Than Ngo <than at redhat.com>
Date:   Wed Apr 20 14:09:13 2011 +0200

    Merge branch 'master' into f14

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