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

[sbergmann]

commit 325fb33de38726d7f8fa82461dbf8b0928652a09
Merge: f37364d d5dc242
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Apr 3 16:45:06 2012 +0200

    Merge branch 'master' into f17

 ...roduced-SystemShellExecuteFlags-URIS_ONLY.patch | 1119 ++++++++++++++++++++
 libreoffice.spec                                   |    7 +-
 2 files changed, 1125 insertions(+), 1 deletions(-)
---