[libreoffice/f17: 2/2] Merge branch 'master' into f17

[Caolán McNamara]

commit 6bf77066a0287b534a2d2b266f3551ef76cd5500
Merge: 34c4dce ee403bb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 6 13:51:05 2012 +0000

    Merge branch 'master' into f17

 ...hbz-799628-crash-with-chewing-IM-with-g3g.patch |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---