[Libreoffice-commits] Changes to 'integration/dev300_m106'

[Jan Holesovsky]

New branch 'integration/dev300_m106' available with the following commits:
commit f0b0fb447e9b19db19ccad1982af11e9571f3ebc
Merge: 8a1876226fd15b0761054960807fbed6ccf9ea73 0ba16aab92d45223bffd857403e95dcd94be952e
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 22 15:09:57 2011 +0200

    Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
    
    Conflicts:
    	postprocess/packcomponents/makefile.mk
    	postprocess/prj/build.lst