[REVIEW 3-6] fix for bnc#780296 bnc#781166

[Kohei Yoshida]

On 09/24/2012 05:46 AM, Noel Power wrote:
> the attached patch is a squash ( and conflict fix ) of
>
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=7539a695b801b92d10ff30463a8c08672a258442
>
>
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=67cde863f63725cb25d69c38d1b74a8d2bfaf9a7

Pushed to 3-6 with my sign-off.

I've re-generated the change ID for this commit since I believe a single 
commit is not supposed to have 2 change ID's associated with it (?)

Kohei

-- 
Kohei Yoshida, LibreOffice hacker, Calc