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

[Than Ngo]

commit 2fd28d7a2ed350246b2c2d8c6455e9c3846d45bc
Merge: 8f29ba5 a450587
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:47:24 2012 +0100

    Merge branch 'f18' into f17

 .gitignore                                       |    1 +
 0001-Fix-Python3-and-Python2-text-handling.patch |   47 ----------------------
 pykde4.spec                                      |   11 +++--
 sources                                          |    2 +-
 4 files changed, 9 insertions(+), 52 deletions(-)
---