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

[Rex Dieter]

commit a01ed9c715dfa5f310891ff649c55ebeaddcdd85
Merge: 283cd64 a86f02c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 13:52:06 2010 -0500

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

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