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

[Caolán McNamara]

commit 1774bc0d6e5d14f7cc27c22fa47038a38c05fcc6
Merge: b684381 a67f28e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 6 11:44:44 2012 +0000

    Merge branch 'master' into f17

 ...hbz-799628-crash-with-chewing-IM-with-g3g.patch |   32 +++++++++
 0001-silence-SolarMutex-not-locked-spew.patch      |   68 ++++++++++++++++++++
 libreoffice.spec                                   |    9 ++-
 3 files changed, 108 insertions(+), 1 deletions(-)
---