[koffice/f14/master: 2/2] Merge commit 'origin/f15/master~1' into f14/master

[Rex Dieter]

commit c50a0a8d1a6c32cfc22afa37f258fff911fd8c47
Merge: 478f741 a20852a
Author: Rex Dieter <rdieter1 at localhost.localdomain>
Date:   Thu Mar 17 09:24:34 2011 -0500

    Merge commit 'origin/f15/master~1' into f14/master

 .gitignore                             |    1 +
 fix-inserting-required-value-2.3.patch |   47 ++++++++++++++++++++++++++++++++
 koffice-2.3.2-kde262941_typo.patch     |   12 --------
 koffice.spec                           |   18 ++++++------
 sources                                |    2 +-
 5 files changed, 58 insertions(+), 22 deletions(-)
---