[kipi-plugins/f13/master: 7/7] Merge remote-tracking branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit af8ba3c3faa0277ea7beac7170d75f79969a7806
Merge: 82c757f 5a5c397
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Feb 22 14:05:36 2011 -0600

    Merge remote-tracking branch 'origin/f14/master' into f13/master

 .gitignore        |    1 +
 kipi-plugins.spec |   15 ++++++++++++++-
 sources           |    2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)
---