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

[Rex Dieter]

commit 58e082372f19e0c74aabccbb86bd95e311b9e8ed
Merge: 4cb6ffa a86f02c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 13:51:24 2010 -0500

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

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