[pykde4/f17: 2/2] Merge branch 'master' into f17

[Rex Dieter]

commit a305f8b981127a083daf6ad2042acca151c679d3
Merge: a131b78 012479c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 15:19:23 2012 -0500

    Merge branch 'master' into f17

 .gitignore  |    1 +
 pykde4.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---