[kipi-plugins/f14/master: 4/4] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit 723936044a8f90d3e905629693d28e2862c01807
Merge: 58e0823 bbf32aa
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Nov 29 22:00:23 2010 -0600

    Merge remote branch 'origin/master' into f14/master

 .gitignore                    |    2 +-
 kipi-plugins-1.4.0-s390.patch |   13 -------------
 kipi-plugins-1.6.0-s390.patch |   13 +++++++++++++
 kipi-plugins.spec             |   14 ++++++++++----
 sources                       |    2 +-
 5 files changed, 25 insertions(+), 19 deletions(-)
---