[koffice/f17: 2/2] Merge branch 'master' into f17

[Rex Dieter]

commit 2c0e721036b1f83543ea2c5fdb17068b49a61427
Merge: 1e5f630 4f3f59a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Mar 3 08:01:13 2012 -0600

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

 dead.package                           |    1 +
 fix-crash-in-kexidb-queries-2.3.patch  |   32 -
 fix-form-color-properties-2.3.patch    |  210 ----
 fix-inserting-required-value-2.3.patch |   47 -
 koffice-2.3.1-libwpg02.patch           | 1334 ------------------------
 koffice-2.3.2-gcc46.patch              |   23 -
 koffice-2.3.3-glib.patch               |   12 -
 koffice-2.3.3-krita_fitscreen.patch    |   53 -
 koffice-2.3.3-no-qdebug-pixmap.patch   |   11 -
 koffice.spec                           | 1783 --------------------------------
 10 files changed, 1 insertions(+), 3505 deletions(-)
---