[kdelibs/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit 877e1053b62c163f7e24f275f001c26385244d36
Merge: 12c8e19 3e5dba2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 4 15:45:43 2011 -0500

    Merge branch 'master' into f16

 .gitignore                        |    3 +-
 kdelibs-4.7.1-CVE-2011-3365.patch |   63 -------------------------------------
 kdelibs.spec                      |   11 +++---
 sources                           |    2 +-
 4 files changed, 7 insertions(+), 72 deletions(-)
---