[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.3.3-3-25-g855e5b0

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 855e5b064afc76ae97c86b1c564828e782222cbc
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Jul 25 12:05:09 2011 +0000

    fix up series

diff --git a/patches/series b/patches/series
index e4558c5..e56a7b4 100644
--- a/patches/series
+++ b/patches/series
@@ -17,8 +17,4 @@ disable-rhino.diff
 bsh-hardcode-path.diff
 mips-openjdk-jre-paths.diff
 libebook-1.2.so.11.diff
-<<<<<<< HEAD
-=======
-vbaobj-visibility-fix.diff
 fix-bridges-cpp-uno-depends.diff
->>>>>>> 9e2eb55... fix mising depends in bridges' build.lst which can cause FTBFS on s390(x), arm, ia64, hppa, alpha

-- 
LibreOffice packaging repository