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

[Caolán McNamara]

commit b658e24fbf81742bad3f26638a14dd4c16b0fab1
Merge: c07846a b707ce4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 27 13:00:20 2012 +0100

    Merge branch 'master' into f17

 libreoffice.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---