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

[Jan Holesovsky]

New branch 'integration/dev300_m106' available with the following commits:
commit c46b58a9e12be832cbe6eb9664c4aa11ed5d9902
Merge: 09b0899c02a35b4abfebe4440523e602315f85e6 6aca381aa8ad13b8b954258df11ace821c8b2b47
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 22 15:08:24 2011 +0200

    Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
    
    Conflicts:
    	python/makefile.mk
    	zlib/makefile.mk