[koffice/f14: 14/14] Merge branch 'master' into f14

[Rex Dieter]

commit aa23b43419310aa488f37f92aa908b801f0f05b8
Merge: a05772e af69100
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 23 15:52:55 2011 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	koffice.spec

 fix-crash-in-kexidb-queries-2.3.patch |   32 +++++
 fix-form-color-properties-2.3.patch   |  210 +++++++++++++++++++++++++++++++++
 koffice-2.3.3-no-qdebug-pixmap.patch  |   11 ++
 koffice.spec                          |   61 ++++++++--
 4 files changed, 302 insertions(+), 12 deletions(-)
---