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

[Rex Dieter]

commit a1e78c0bcb9f232deede796d7ac1ab1dc60cdcfe
Merge: 34f9f46 2b22455
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 17 13:04:47 2011 -0500

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

 .gitignore        |    4 +---
 kipi-plugins.spec |    7 +++++--
 sources           |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
---