[libreoffice/f17: 5/5] merge conflicts

[Caolán McNamara]

commit 2297a43fe93b151fe12125452d02ce461d66abd8
Merge: a230d12 8e82ff2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 1 10:56:20 2012 +0000

    merge conflicts

 ...bz-788045-swriter-help-etc-doesn-t-show-h.patch |   21 ++-----------------
 libreoffice.spec                                   |    5 ++-
 2 files changed, 6 insertions(+), 20 deletions(-)
---