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

[Than Ngo]

commit 13745b81495c7de22f7e63890544668b309b1e77
Merge: 5550b35 c816e01
Author: Than Ngo <than at redhat.com>
Date:   Wed Nov 9 16:11:55 2011 +0100

    Merge branch 'master' into f16

 kdelibs-4.7.3-CVE-0046.patch |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
---