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

[Rex Dieter]

commit d81a6de12424a22968cfc6fe915ed6dc594c9b1c
Merge: f1ca3d9 0aa050a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Nov 4 15:02:33 2011 -0500

    Merge branch 'master' into f16

 .gitignore  |    1 +
 PyKDE4.spec |   49 +++++++++++++++++++++++++++++++++++--------------
 sources     |    2 +-
 3 files changed, 37 insertions(+), 15 deletions(-)
---