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

[Rex Dieter]

commit 4edb336c6c6474429c4aec0d79fe3a14ebfcdad5
Merge: 2fd28d7 b426095
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 19:20:51 2012 -0600

    Merge branch 'f18' into f17

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