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

[Rex Dieter]

commit 5a5c397ac261c3d39f060640377e74ddf164e2e2
Merge: 4b85055 2f38ebb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Feb 3 14:13:27 2011 -0600

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

 kipi-plugins.spec |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---