[koffice/f14/master: 30/30] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit 07e8772052614069a446ee9b485d5bc5824b636e
Merge: edb6929 54cf29b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 26 06:40:23 2011 -0600

    Merge remote branch 'origin/master' into f14/master
    
    Conflicts:
    	koffice.spec

 .gitignore                                         |    2 +-
 fix-crash-on-closing-sqlite-connection-2.2.2.patch |   13 -
 koffice-2.3.1-libwpg02.patch                       | 1334 ++++++++++++++++++++
 koffice.spec                                       |  253 +++--
 sources                                            |    2 +-
 support-large-memo-values-for-msaccess-2.2.2.patch |   96 --
 6 files changed, 1499 insertions(+), 201 deletions(-)
---