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

[Rex Dieter]

commit f1ca3d91c60ceaa162edc0f6b1aad383b232a51c
Merge: 858e3d5 a1af98e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 8 20:07:24 2011 -0500

    Merge branch 'master' into f16

 PyKDE4.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---