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

[Rex Dieter]

commit 4cb6ffadc05110a8f6e50a88721967f888a8d602
Merge: 3bf55be 81c468b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 13:36:06 2010 -0500

    Merge remote branch 'origin/master' into f14/master
    
    Conflicts:
    	kipi-plugins.spec

 .gitignore                          |    2 +-
 kipi-plugins-1.3.0-fix-unsafe.patch |   20 ----------
 kipi-plugins.spec                   |   70 ++++++++++++++++++++++------------
 sources                             |    2 +-
 4 files changed, 47 insertions(+), 47 deletions(-)
---