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

[Rex Dieter]

commit 478f741fa9707d2efe82de8fd00c6b95723442ff
Merge: 5d86119 4467dbe
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Feb 22 07:58:54 2011 -0600

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

 koffice.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---