[libreoffice/f17: 2/3] Merge remote-tracking branch 'origin/master' into f17

[David Tardon]

commit 1f40b5e9f3e113212d354f77d5db4ce92e8ae964
Merge: 1b76f5f 9ec8107
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 16 12:38:37 2012 +0100

    Merge remote-tracking branch 'origin/master' into f17

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