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

[Rex Dieter]

commit 34f9f462646149794c2784d32031220acbe073a0
Merge: 5a5c397 1bafd6f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 17 13:04:16 2011 -0500

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

 kipi-plugins.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---