[koffice/f16: 3/3] Merge branch 'master' into f16

[Rex Dieter]

commit 617839f5bbb1a5c6d0c79ce4c0f668e58a772d09
Merge: 0f20468 af69100
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 23 15:49:22 2011 -0500

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

 fix-crash-in-kexidb-queries-2.3.patch |   32 +++++
 fix-form-color-properties-2.3.patch   |  210 +++++++++++++++++++++++++++++++++
 koffice.spec                          |   15 ++-
 3 files changed, 255 insertions(+), 2 deletions(-)
---