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

[Jan Holesovsky]

New branch 'integration/dev300_m106' available with the following commits:
commit 3f4d29e4d07ac341f058a20a84cec9c1ee13bd2a
Merge: 4144f1a9b836c79ac0fcab8fc320e35be4685fcf bc1ba98b53ce04ef28b88bba8b3dca52d3023111
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 22 15:07:31 2011 +0200

    Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
    
    Conflicts:
    	default_images/vcl/res/closedochc.png
    	default_images/vcl/res/collate_h.png
    	default_images/vcl/res/msgbox_hc.png
    	default_images/vcl/res/ncollate_h.png
    	default_images/vcl/source/src/collate_h.png
    	default_images/vcl/source/src/ncollate_h.png
    	ooo_custom_images/oxygen/svtools/res/collate_h.png
    	ooo_custom_images/oxygen/svtools/res/ncollate_h.png