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

[Caolán McNamara]

commit affd03915271913cd7f966a14ba38079af4675b0
Merge: b658e24 aa2be9c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 27 15:26:57 2012 +0100

    Merge branch 'master' into f17

 ...not-complain-about-soffice-command-line-o.patch |   42 ++++++++++++++++++++
 libreoffice.spec                                   |    2 +
 2 files changed, 44 insertions(+), 0 deletions(-)
---