ooo-build r14775 - in branches/opensuse-11-1: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Mon Dec  8 10:44:14 2008
New Revision: 14775
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14775&view=rev

Log:
Nah. Revert the commenting out of sw-mailmerge-faster.diff.

Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/patches/dev300/apply

Modified: branches/opensuse-11-1/patches/dev300/apply
==============================================================================
--- branches/opensuse-11-1/patches/dev300/apply	(original)
+++ branches/opensuse-11-1/patches/dev300/apply	Mon Dec  8 10:44:14 2008
@@ -600,9 +600,7 @@
 # Allows to edit a csv data source after a mail merge
 sw-remove-csv-lock.diff, i#85133, mloiseleur
 # Provides a great speed-up for a mail merge operation : 7x faster 
-# It seems possible that this patch breaks mail merge, see
-# bnc#447047.  Let's not risk it.
-#sw-mailmerge-faster.diff, i#40287, mloiseleur
+sw-mailmerge-faster.diff, i#40287, mloiseleur
 
 
 [ CalcFixes ]