[koffice/f15: 12/12] Merge branch 'master' into f15

[Rex Dieter]

commit b0b62098ec83e6678215527da4db837a9b38b4b6
Merge: 464c4a4 af69100
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 23 15:50:34 2011 -0500

    Merge branch 'master' into f15
    
    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                          |   53 +++++++--
 4 files changed, 296 insertions(+), 10 deletions(-)
---
diff --cc koffice.spec
index 7f5b462,2a44f18..3a16116
--- a/koffice.spec
+++ b/koffice.spec
@@@ -1213,6 -1219,31 +1219,33 @@@ f
  
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Fri Sep 23 2011 Rex Dieter <rdieter at fedoraproject.org> 3:2.3.3-12
+ - upstream fix-form-color-properties-2.3.patch
+ - upstream fix-crash-in-kexidb-queries-2.3.patch
+ 
+ * Mon Sep 19 2011 Marek Kasik <mkasik at redhat.com> - 3:2.3.3-11
+ - Rebuild (poppler-0.17.3)
+ 
+ * Thu Sep 08 2011 Jaroslav Reznik <jreznik at redhat.com> - 3:2.3.3-10
+ - Qt 4.8 FTBFS (rhbz#736659)
+ 
+ * Fri Jul 15 2011 Marek Kasik <mkasik at redhat.com> - 3:2.3.3-9
+ - Rebuild (poppler-0.17.0)
+ 
+ * Tue Jul 12 2011 Rex Dieter <rdieter at fedoraproject.org> 3:2.3.3-8
+ - BR: +pkgconfig(libkdcraw),pkgconfig(poppler-qt4)
+ 
+ * Tue Jul 05 2011 Rex Dieter <rdieter at fedoraproject.org> 3:2.3.3-7
+ - rebuild (libpqxx)
+ 
+ * Thu Jun 30 2011 Rex Dieter <rdieter at fedoraproject.org> 3:2.3.3-6
+ - rebuild (kdegraphics)
+ 
+ * Mon Jun 20 2011 ajax at redhat.com - 3:2.3.3-5
+ - Rebuild for new glew soname
+ 
  * Wed Mar 23 2011 Dan Horák <dan at danny.cz> - 3:2.3.3-4
  - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)