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

[Rex Dieter]

commit 14c89fad2e27d95c1899b57a1fbe3b55967f629b
Merge: 07e8772 9b7a1ec
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Feb 20 16:47:33 2011 -0600

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

 .gitignore                |    2 +-
 koffice-2.3.2-gcc46.patch |   23 +++++++++++++++++++++++
 koffice.spec              |   43 +++++++++++++++++++++++++++++--------------
 sources                   |    2 +-
 4 files changed, 54 insertions(+), 16 deletions(-)
---