[libreoffice/f17: 7/8] merge from origin/master

[David Tardon]

commit cd349ce4817f7f67a02ce4c5925020243b38b328
Merge: d800415 e4656ed
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 31 07:42:08 2012 +0200

    merge from origin/master

 .gitignore       |    8 ++++++++
 libreoffice.spec |   40 ++++++++++++++++++++--------------------
 sources          |    8 ++++----
 3 files changed, 32 insertions(+), 24 deletions(-)
---
diff --cc libreoffice.spec
index bd3250d,8846aad..25643ab
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@@ -2314,12 -2304,19 +2304,22 @@@ update-desktop-database %{_datadir}/app
  %endif
  
  %changelog
 +* Wed May 30 2012 Caolán McNamara <caolanm at redhat.com> - 3.5.3.2-7
 +- Resolves: rhbz#822522 S390 FTBFS
 +
- * Thu May 17 2012 Caolán McNamara <caolanm at redhat.com> - 3.5.3.2-6
+ * Wed May 23 2012 David Tardon <dtardon at redhat.com> - 3.5.4.2-1
+ - 3.5.4 rc2
+ 
+ * Thu May 17 2012 Caolán McNamara <caolanm at redhat.com> - 3.5.4.1-2
  - Resolves: rhbz#811226 ARM FTBFS
  
+ * Wed May 16 2012 David Tardon <dtardon at redhat.com> - 3.5.4.1-1
+ - 3.5.4 rc1
+ - drop integrated 0001-do-not-prepend-n-twice-it-confuses-KFileDialog-rhbz-.patch
+ - drop integrated 0001-incrementing-index-twice-in-one-run-seems-wrong.patch
+ - drop integrated 0001-fdo-49365-correctly-map-monitor-index-back-to-screen.patch
+ - drop integrated 0001-rhbz-809019-count-mirrored-monitors-as-one.patch
+ 
  * Sun May 13 2012 Caolán McNamara <caolanm at redhat.com> - 3.5.3.2-5
  - Resolves: fdo#49849 line breaking fixes for Hebrew