[koffice/f13/master: 48/48] Merge branch 'master' into f13

[Rex Dieter]

commit b6103051c26542faef491cb7c6250a01f6d691fe
Merge: ea3eb77 ea4fddc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 20 19:58:17 2010 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	koffice.spec
    	sources

 .gitignore                                         |    2 +-
 fix-crash-on-closing-sqlite-connection-2.2.2.patch |   13 +++
 koffice.spec                                       |  100 +++++++++++++++-----
 sources                                            |    2 +-
 support-large-memo-values-for-msaccess-2.2.2.patch |   96 +++++++++++++++++++
 5 files changed, 189 insertions(+), 24 deletions(-)
---