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

[Jan Holesovsky]

New branch 'integration/dev300_m106' available with the following commits:
commit 2de3935c002b62bfbc7d6418e109ab0d400d15f3
Merge: 6e67c8168b01a255ac8b7b7f4edaace09739fb53 a448845572df3efc8ab9af0fae5b763ef0f0a6d0
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 22 15:08:18 2011 +0200

    Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
    
    Conflicts:
    	sd/source/ui/app/res_bmp.src