[libreoffice/f16: 6/6] merge

[David Tardon]

commit cf436022407c38f2b8fcde6b6dc9d49683836047
Merge: 2a7c04f b0d8eda
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Aug 30 15:02:37 2011 +0200

    merge

 libreoffice.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---